Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.6 grimoire by Eric Sandall (b992897e77fbe5e49b5b490ad0484b5eb5a5b0e8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.6 grimoire by Eric Sandall (b992897e77fbe5e49b5b490ad0484b5eb5a5b0e8)
  • Date: Thu, 23 Nov 2006 12:48:16 -0600

GIT changes to stable-rc-0.6 grimoire by Eric Sandall <sandalle@moby.(none)>:

ChangeLog | 13
accounts | 1
audio-creation/jmax/DEPENDS | 2
audio-creation/jmax/HISTORY | 3
audio-drivers/alsa-utils/HISTORY | 3
audio-drivers/alsa-utils/PRE_BUILD | 3
audio-drivers/alsa-utils/speaker-test.patch | 22
audio-drivers/dream/BUILD | 3
audio-drivers/dream/DETAILS | 6
audio-drivers/dream/HISTORY | 5
audio-drivers/line6/BUILD | 1
audio-drivers/line6/CONFLICTS | 1
audio-drivers/line6/DETAILS | 34 +
audio-drivers/line6/HISTORY | 28 +
audio-drivers/line6/PRE_BUILD | 3
audio-drivers/line6/TRIGGERS | 1
audio-drivers/podxt/DEPENDS | 1
audio-drivers/podxt/DETAILS | 7
audio-drivers/podxt/HISTORY | 3
audio-drivers/podxt/INSTALL | 1
audio-drivers/podxt/PRE_BUILD | 4
audio-drivers/podxt/TRIGGERS | 2
audio-drivers/yiff/BUILD | 3
audio-drivers/yiff/DEPENDS | 6
audio-drivers/yiff/DETAILS | 4
audio-drivers/yiff/HISTORY | 7
audio-drivers/yiff/INSTALL | 3
audio-players/dcd/BUILD | 12
audio-players/dcd/DEPENDS | 2
audio-players/dcd/DETAILS | 13
audio-players/dcd/HISTORY | 6
audio-players/dcd/PREPARE | 8
audio-players/xmms2/DEPENDS | 3
audio-players/xmms2/HISTORY | 3
chat-im/gnomemeeting/BUILD | 1
chat-im/gnomemeeting/DEPENDS | 1
chat-im/gnomemeeting/DETAILS | 27 -
chat-im/gnomemeeting/FINAL | 7
chat-im/gnomemeeting/HISTORY | 116 -----
chat-im/gnomemeeting/INSTALL | 1
chat-im/gnomemeeting/PREPARE | 3
chat-im/gnomemeeting/PRE_BUILD | 1
chat-im/gnomemeeting/TRIGGERS | 1
chat-im/gnomemeeting/gnomemeeting-1.2.2.tar.gz.sig | 0
chat-libs/linphone-im/BUILD | 19
chat-libs/linphone-im/DEPENDS | 2
chat-libs/linphone-im/DETAILS | 15
chat-libs/linphone-im/HISTORY | 25 -
chat-libs/linphone-im/INSTALL | 5
chat-libs/linphone-im/PRE_BUILD | 7
chat-libs/openh323/BUILD | 20
chat-libs/openh323/DEPENDS | 7
chat-libs/openh323/DETAILS | 32 -
chat-libs/openh323/HISTORY | 41 -
chat-libs/openh323/PREPARE | 1
chat-libs/openh323/patch_openh323 | 24 -
dev/null |binary
devel/clearsilver/DEPENDS | 6
devel/clearsilver/HISTORY | 3
devel/eclipse/BUILD | 8
devel/eclipse/HISTORY | 4
devel/graphviz/DEPENDS | 2
devel/graphviz/HISTORY | 3
devel/jruby/DEPENDS | 2
devel/jruby/HISTORY | 3
editors/lyx/HISTORY | 1
editors/lyx/POST_REMOVE | 1
editors/lyx/REPAIR^none^POST_REMOVE | 1
ftp/dctc/CONFIGURE | 1
ftp/dctc/DEPENDS | 8
ftp/dctc/HISTORY | 4
groups | 1
http/apache2/BUILD | 5
http/apache2/HISTORY | 4
http/apache2/config.layout | 35 +
kernels/lm_sensors/HISTORY | 3
kernels/lm_sensors/PRE_BUILD | 3
libcompat | 12
libs/mpfr/BUILD | 2
libs/mpfr/DEPENDS | 5
libs/mpfr/DETAILS | 26 -
libs/mpfr/HISTORY | 6
libs/mpfr/PRE_BUILD | 6
mail/mutt/HISTORY | 3
mail/mutt/patches/PATCH_ORDER | 1
mail/mutt/patches/xtitles/PATCH_DETAILS | 3
mail/mutt/patches/xtitles/patch-1.5.5.1.nt.xtitles.3.ab.1.bz2 |binary
net/iptraf/DETAILS | 5
net/iptraf/HISTORY | 6
net/iptraf/PRE_BUILD | 6
net/iptraf/iptraf_headers.patch | 60 ++
net/mtr/CONFIGURE | 1
net/mtr/DETAILS | 2
net/mtr/HISTORY | 5
net/mtr/INSTALL | 5
security-libs/nessus-libraries/DEPENDS | 6
security-libs/nessus-libraries/HISTORY | 3
shell-term-fm/fish/DEPENDS | 3
shell-term-fm/fish/HISTORY | 3
shell-term-fm/screen/CONFIGURE | 10
shell-term-fm/screen/HISTORY | 4
shell-term-fm/screen/INSTALL | 11
video-libs/gst-plugins-base/DEPENDS | 6
video-libs/gst-plugins-base/HISTORY | 3
video-libs/gst-plugins-good/DEPENDS | 6
video-libs/gst-plugins-good/HISTORY | 3
video-libs/gstreamer/DEPENDS | 6
video-libs/gstreamer/HISTORY | 3
x11-toolkits/wxgtk-no-unicode/DETAILS | 10
x11-toolkits/wxgtk-no-unicode/HISTORY | 8
x11-toolkits/wxgtk-no-unicode/PRE_BUILD | 5
x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-gcc4.patch | 224
++++++++++
x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-gcc4_v2.patch | 11
x11/pypanel/DEPENDS | 10
x11/pypanel/DETAILS | 4
x11/pypanel/HISTORY | 6
116 files changed, 705 insertions(+), 465 deletions(-)

New commits:
commit b992897e77fbe5e49b5b490ad0484b5eb5a5b0e8
Author: George Sherwood <chat AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>

apache2: Added config.layout from apache22. Bug #13051.

commit e9da996a33a5ef656b7476067c1c595c07549422
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>

nessus-libraries: depend on openssl unconditionally #11945

still doesn't build though, tough c error

commit 2bc8ba205047528bdae3d0176892541ce65b50ae
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>

lm_sensors: fix man path #10230

commit 00f1489b2c63ea52ef1cd2f22172f9ba7e022f15
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>

eclipse: fix #10448

commit 9c347ded9f48518d534999ac5d5cc994017c6b15
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>

dcd * BUILD: convert to build api 2, simplify, fix #10733, fix man
install path * DETAILS: bump to 0.99.2

commit 9eaebb17487090179918c0239a0ea30ddf64b319
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>

fish: DEPENDS: added bc #10766

commit 984553cb09151f74147fb94e3922addd13ec3492
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>

forgot to source FUNCTIONS

commit b595771cd00f4555f5501512803dda30a592efd8
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>

pypanel
fix #10811 - update to 2.4
added missing dependencies

commit e5cd09e83b6a1a7e177b7532c18c4e11514cf83f
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Eric Sandall <sandalle@moby.(none)>

gstreamer: depends on pyxml when building docs, bug 10909

commit c6ac210e1eddc2d2c6c787a72a0a9c6ae7587253
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Eric Sandall <sandalle@moby.(none)>

gst-plugins-good: depends on pyxml when building docs

commit 7631c5b25ddeb44b1e3a2a95e0ae0df6d3fd3f5e
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Eric Sandall <sandalle@moby.(none)>

gst-plugins-base: depends on pyxml when building docs, bug 10918

commit a3ae78082b84a6539ee424f5b7806dd5d2f97556
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Eric Sandall <sandalle@moby.(none)>

added is_depends_enabled function to libcompat

Conflicts:

ChangeLog

commit f989262d564a7b14f0286c1ec8c6c20a5755fa2a
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>

mutt: added xtitles patch #10936

thanks go to Mads Laursen for providing a patch for the patch

commit 1b70664ddca47cad9a3bbd375e6a7545305c9b37
Author: George Sherwood <chat AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>

linphone-im: Removed. Not developed or used. Broken.

Conflicts:

ChangeLog

commit a02615770d9458db7d994e9fe0643a445399c93b
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>

fix missing grimoire argument for java dependencies

one of them fixes #11106

Conflicts:

audio-players/xmms2/HISTORY

commit 643b8b6b7588802d86b9d442c6ee6ea504ae7089
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>

rename podxt to line6

also fixes #11326

Conflicts:

ChangeLog

commit 61c28aae4de8181dfc87d79262d0f8df9fbd8ac4
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>

alsa-utils: fix #11356

commit e06d052330bbfb9ee3a10676eecc52a6f75baf9e
Author: George Sherwood <chat AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>

gnomemeeting: Removed spell. Been deprecated 10 months for ekiga.
openh323: Removed spell. Not required. Not developed. Doesn't build.
Ekiga depends on opal now.

Conflicts:

ChangeLog

commit 705fc40493c218d5fae2f1f16bee14f7d81b26da
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>

iptraf: fix #11506

commit bbeff362c8fd87cc3a00c1a62738160c331d8a0d
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>

screen: fix rest of #11635 - cleanup, sanity

commit a81e15a3c85acff72aefe00c0f3ddd05a3b10321
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>

added the backup user and group

Conflicts:

ChangeLog

commit 10786d6b3a9bef4b1ab18632170b7ca1b451fec1
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>

lyx: fix #11730

commit 5a7b5f5db7de484fe8c0a8381b2dd88edfd15da4
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>

mtr: fix installation and ask for suid #11860

commit 520d8846d45c68feb5fa85a546d97ca5c67a4f29
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>

dctc: fix bug 12219

commit b204c92a3c646f4645bebb32229d6465b0014259
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>

dctc: fix bug 12219

commit eb321907cf8bcb62af17cbb55af036503d472070
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>

dream: update and fix #12397

commit bb91377ba8d13caf36b00a0e41a8151f36f3c29f
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>

yiff: update and/to fix #12707

commit 14bcb6f3cf4d6713eb528b6d968e3a49f92be9a5
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>

clearsilver: fix #12939

commit cf049ef8ea08b0a638e906792dcd14cf625aaa5f
Author: George Sherwood <chat AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>

wsgtk-no-unicode: Added redhat patches to work with gcc 4.0.x

commit dee19cc3f80e3b6ac47df38cdf4cd96d24918e24
Author: George Sherwood <chat AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>

wxgtk-no-unicode: Downgraded to 2.4.2. This spell was created for
compatibility with audacity. Current audacity versions only work with
2.4.x series.

commit fcd39b48001513ddb4ed19d3e5480ee3e22008a4
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>

mpfl: updated to 2.2.0; use a tarball + cumulative patch
fixes #13268

diff --git a/ChangeLog b/ChangeLog
index 2212317..0293301 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,17 @@
+2006-11-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * libcompat: added is_depends_enabled function from
+ is_depends_enabled.function
+
+2006-11-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * audio-drivers/podxt renamed to line6
+
2006-11-11 George Sherwood <george AT beernabeer.com>
+ * chat-libs/openh323: removed, doesn't build. Not used any more.
* chat-im/eb-lite: removed. Not developed. Won't build.
+ * chat-libs/linphone-im: removed. Not developed or used. Broken.

-2006-10-29 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
- * libs/sdl_pango: new spell (guess what it does) #13217
+2006-10-21 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * accounts, groups: added iplog and backup

2006-10-20 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* security/netpipe renamed to netpipe-redirector to avoid conflict
#8580
diff --git a/accounts b/accounts
index 5ffc0e4..0bf66b9 100755
--- a/accounts
+++ b/accounts
@@ -6,6 +6,7 @@ news:9:9
uucp:10:10
proxy:13:13
www-data:33:33
+backup:34:34
firebird:84:84
bind:101:101
gnats:102:102
diff --git a/audio-creation/jmax/DEPENDS b/audio-creation/jmax/DEPENDS
index d3075a7..cb47f9d 100755
--- a/audio-creation/jmax/DEPENDS
+++ b/audio-creation/jmax/DEPENDS
@@ -1,2 +1,2 @@
-depends j2sdk &&
+depends j2sdk z-rejected &&
depends alsa-lib
diff --git a/audio-creation/jmax/HISTORY b/audio-creation/jmax/HISTORY
index 6f09fca..dea2771 100644
--- a/audio-creation/jmax/HISTORY
+++ b/audio-creation/jmax/HISTORY
@@ -1,3 +1,6 @@
+2006-11-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: java is in z-rejected
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/audio-drivers/alsa-utils/HISTORY
b/audio-drivers/alsa-utils/HISTORY
index 9f899d2..d6ab41b 100644
--- a/audio-drivers/alsa-utils/HISTORY
+++ b/audio-drivers/alsa-utils/HISTORY
@@ -1,3 +1,6 @@
+2006-11-11 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * PRE_BUILD, speaker-test.patch: added to fix #11356
+
2006-10-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.13

diff --git a/audio-drivers/alsa-utils/PRE_BUILD
b/audio-drivers/alsa-utils/PRE_BUILD
new file mode 100755
index 0000000..8ddcaab
--- /dev/null
+++ b/audio-drivers/alsa-utils/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SPELL_DIRECTORY/speaker-test.patch
diff --git a/audio-drivers/alsa-utils/speaker-test.patch
b/audio-drivers/alsa-utils/speaker-test.patch
new file mode 100644
index 0000000..ce05630
--- /dev/null
+++ b/audio-drivers/alsa-utils/speaker-test.patch
@@ -0,0 +1,22 @@
+--- speaker-test/speaker-test.c~ 2006-04-06 10:24:12.000000000 -0700
++++ speaker-test/speaker-test.c 2006-04-20 18:23:04.704636250 -0700
+@@ -44,9 +44,6 @@
+ #include <getopt.h>
+ #include <inttypes.h>
+ #include <ctype.h>
+-#ifdef ENABLE_NLS
+-#include <locale.h>
+-#endif
+ #include <byteswap.h>
+
+ #define ALSA_PCM_NEW_HW_PARAMS_API
+@@ -56,6 +53,9 @@
+ #include <math.h>
+ #include "pink.h"
+ #include "aconfig.h"
++#ifdef ENABLE_NLS
++#include <locale.h>
++#endif
+ #include "gettext.h"
+ #include "version.h"
+
diff --git a/audio-drivers/dream/BUILD b/audio-drivers/dream/BUILD
index 8793c59..2506794 100755
--- a/audio-drivers/dream/BUILD
+++ b/audio-drivers/dream/BUILD
@@ -1,3 +1,4 @@
[ -f bootstrap ] && sh bootstrap
-./configure ${OPTS} --prefix=${INSTALL_ROOT}/usr --with-qtdir=/usr/share/qt
&&
+sed -i 's,$QTDIR/bin,/usr/bin,' configure &&
+./configure $OPTS --prefix=$INSTALL_ROOT/usr --with-qtdir=/usr/include/qt
--without-faad2 &&
make
diff --git a/audio-drivers/dream/DETAILS b/audio-drivers/dream/DETAILS
index e32cb0d..2dfc6bb 100755
--- a/audio-drivers/dream/DETAILS
+++ b/audio-drivers/dream/DETAILS
@@ -1,10 +1,10 @@
SPELL=dream
- VERSION=1.1
+ VERSION=1.6.25
SOURCE=drm-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/drm-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/drm/${SOURCE}
-
SOURCE_HASH=sha512:f397243fdc01303b91ea3a406703ef72613b96a1ca58cdd342680d20e3ecb87cc441f608483b193f9b54c126d4e98ea1ca61a421e152de51cbd3413b9221f376
-
WEB_SITE=http://www.tu-darmstadt.de/fb/et/uet/fguet/mitarbeiter/vf/DRM/DRM.html
+
SOURCE_HASH=sha512:2a815a1d308c5a7162764bd0c45774ec6e1ffd6d6e6fb8d750e767988d6f7e513c00d997197a35f10d7e92a4bf6f3401b00992e4c7b74802042a71bb159c04ac
+ WEB_SITE=http://drm.sourceforge.net/
ENTERED=20041022
LICENSE[0]=GPL
KEYWORDS="drivers audio"
diff --git a/audio-drivers/dream/HISTORY b/audio-drivers/dream/HISTORY
index ec1f8fa..aadc7e2 100644
--- a/audio-drivers/dream/HISTORY
+++ b/audio-drivers/dream/HISTORY
@@ -1,3 +1,8 @@
+2006-11-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: new version, new url
+ * BUILD: fix qt path and disable faad2 - needs faad2 > 2.0
+ now the spell works again #12397
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/audio-drivers/line6/BUILD b/audio-drivers/line6/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-drivers/line6/BUILD
@@ -0,0 +1 @@
+true
diff --git a/audio-drivers/line6/CONFLICTS b/audio-drivers/line6/CONFLICTS
new file mode 100644
index 0000000..4d17680
--- /dev/null
+++ b/audio-drivers/line6/CONFLICTS
@@ -0,0 +1 @@
+conflicts podxt y
diff --git a/audio-drivers/line6/DETAILS b/audio-drivers/line6/DETAILS
new file mode 100755
index 0000000..229d997
--- /dev/null
+++ b/audio-drivers/line6/DETAILS
@@ -0,0 +1,34 @@
+ SPELL=line6
+ VERSION=0.6.5
+ SOURCE=${SPELL}usb-$VERSION.tar.bz2
+ SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}usb-$VERSION
+ SOURCE_URL[0]=http://www.tanzband-scream.at/line6/download/$SOURCE
+
SOURCE_HASH=sha512:459f3e546165cc8eb830db5693df5435c007725827758404895f7a6eda69b10227898584f417ab975224c63f82f9d667a96e48e4dfc409a2c1cfc2b0264079b6
+ WEB_SITE=http://www.tanzband-scream.at/line6/
+ ENTERED=20041201
+ LICENSE=GPL
+ KEYWORDS="usb drivers audio"
+ SHORT="USB Driver for Line6 PODxt"
+cat << EOF
+This is an experimental Linux driver for the guitar amp, cab, and effects
+modeller PODxt Pro by Line6 (and similar devices), supporting the following
+features:
+ * Reading/writing individual parameters
+ * Reading/writing complete channel, effects setup, and amp setup data
+ * Channel switching
+ * Virtual MIDI interface
+ * Tuner access
+ * Playback/capture/mixer device for any ALSA-compatible PCM audio
application
+ * Signal routing (record clean/processed guitar signal, re-amping)
+
+It should work at least with the following devices:
+ - BassPODxt
+ - BassPODxt Pro
+ - BassPODxt Live
+ - PODxt Live
+ - GuitarPort
+ - PODxt
+ - PODxt Pro
+ - SeaMonkey
+Moreover, preliminary support for the Variax Workbench is included.
+EOF
diff --git a/audio-drivers/line6/HISTORY b/audio-drivers/line6/HISTORY
new file mode 100644
index 0000000..299d1bd
--- /dev/null
+++ b/audio-drivers/line6/HISTORY
@@ -0,0 +1,28 @@
+2006-11-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * renamed from podxt and updated to 0.6.5 also fixing #11326
+
+2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: [automated] Removed UPDATED.
+
+2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: [automated] Removed BUILD_API=2.
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
+2005-12-07 Flavien Bridault <disk AT sourcemage.org>
+ * DETAILS: updated to 0.5.2
+
+2005-11-29 Seth Woolley <seth AT tautology.org>
+ * DETAILS: MD5 -> SHA512
+
+2005-09-27 Flavien Bridault <disk AT sourcemage.org>
+ * DETAILS: updated to 0.4
+ * PRE_BUILD: use get_kernel_version
+
+2005-05-29 Flavien Bridault <disk AT sourcemage.org>
+ * DETAILS: updated to 0.3
+
+2005-01-14 Flavien Bridault <disk AT sourcemage.org>
+ * Created spell
+
diff --git a/audio-drivers/line6/PRE_BUILD b/audio-drivers/line6/PRE_BUILD
new file mode 100755
index 0000000..bbb4492
--- /dev/null
+++ b/audio-drivers/line6/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i "s/\$(shell\ uname\ -r)/$(get_kernel_version)/" Makefile
diff --git a/audio-drivers/line6/TRIGGERS b/audio-drivers/line6/TRIGGERS
new file mode 100755
index 0000000..bb1c400
--- /dev/null
+++ b/audio-drivers/line6/TRIGGERS
@@ -0,0 +1 @@
+on_cast linux cast_self
diff --git a/audio-drivers/podxt/DEPENDS b/audio-drivers/podxt/DEPENDS
new file mode 100755
index 0000000..792b3d5
--- /dev/null
+++ b/audio-drivers/podxt/DEPENDS
@@ -0,0 +1 @@
+depends line6
diff --git a/audio-drivers/podxt/DETAILS b/audio-drivers/podxt/DETAILS
index f993bc4..009d30e 100755
--- a/audio-drivers/podxt/DETAILS
+++ b/audio-drivers/podxt/DETAILS
@@ -1,11 +1,12 @@
SPELL=podxt
VERSION=0.5.2
- SOURCE=${SPELL}pro-$VERSION.tar.bz2
+# SOURCE=${SPELL}pro-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}pro-$VERSION
- SOURCE_URL[0]=http://www.tanzband-scream.at/line6/download/$SOURCE
-
SOURCE_HASH=sha512:932334094d899d90f5fe96efc9e36b87bf1716138cf519aaa6b33559716b3e2a10ff574dd29a1262da45cf7350a54f8c57826e8c28b4c1ec93e64a01350bfc5d
+# SOURCE_URL[0]=http://www.tanzband-scream.at/line6/download/$SOURCE
+#
SOURCE_HASH=sha512:932334094d899d90f5fe96efc9e36b87bf1716138cf519aaa6b33559716b3e2a10ff574dd29a1262da45cf7350a54f8c57826e8c28b4c1ec93e64a01350bfc5d
WEB_SITE=http://www.tanzband-scream.at/line6/
ENTERED=20041201
+ PATCHLEVEL=1
LICENSE=GPL
KEYWORDS="usb drivers audio"
SHORT="USB Driver for Line6 PODxt"
diff --git a/audio-drivers/podxt/HISTORY b/audio-drivers/podxt/HISTORY
index 817cbc3..bfd15b7 100644
--- a/audio-drivers/podxt/HISTORY
+++ b/audio-drivers/podxt/HISTORY
@@ -1,3 +1,6 @@
+2006-11-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * renamed to line6
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/audio-drivers/podxt/INSTALL b/audio-drivers/podxt/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-drivers/podxt/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/audio-drivers/podxt/PRE_BUILD b/audio-drivers/podxt/PRE_BUILD
index bbb4492..27ba77d 100755
--- a/audio-drivers/podxt/PRE_BUILD
+++ b/audio-drivers/podxt/PRE_BUILD
@@ -1,3 +1 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-sed -i "s/\$(shell\ uname\ -r)/$(get_kernel_version)/" Makefile
+true
diff --git a/audio-drivers/podxt/TRIGGERS b/audio-drivers/podxt/TRIGGERS
index bb1c400..11dcfd8 100755
--- a/audio-drivers/podxt/TRIGGERS
+++ b/audio-drivers/podxt/TRIGGERS
@@ -1 +1 @@
-on_cast linux cast_self
+on_cast podxt dispel_self
diff --git a/audio-drivers/yiff/BUILD b/audio-drivers/yiff/BUILD
index 3881e15..ec3c065 100755
--- a/audio-drivers/yiff/BUILD
+++ b/audio-drivers/yiff/BUILD
@@ -1 +1,2 @@
-make linux
+sed -i "/MAN_DIR\s*=/ s,\$(PREFIX)/man/,$INSTALL_ROOT/usr/share/man/,"
*/Makefile* &&
+make linux LIBS="-lm -lstdc++"
diff --git a/audio-drivers/yiff/DEPENDS b/audio-drivers/yiff/DEPENDS
index 1b7afc4..5546039 100755
--- a/audio-drivers/yiff/DEPENDS
+++ b/audio-drivers/yiff/DEPENDS
@@ -1,3 +1,5 @@
depends g++ &&
-depends gtk+ &&
-depends zlib
+depends zlib &&
+
+optional_depends alsa-lib "" "" "to use alsa for the backend" &&
+optional_depends gtk+ "" "" "for yiffconfig"
diff --git a/audio-drivers/yiff/DETAILS b/audio-drivers/yiff/DETAILS
index 7dc0088..b1b6a2c 100755
--- a/audio-drivers/yiff/DETAILS
+++ b/audio-drivers/yiff/DETAILS
@@ -1,9 +1,9 @@
SPELL=yiff
- VERSION=2.14.2
+ VERSION=2.14.5
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=http://wolfpack.twu.net/users/wolfpack/${SOURCE}
-
SOURCE_HASH=sha512:4f9ca3954c6991529ec33e61115b158a78854d5ae7e8820585c67e7a878e539d8f08ac0a14d1eb256a078d72793ab852564ad80d39418478cc7a6454439dbcd0
+
SOURCE_HASH=sha512:af552450f121fa4ede075fb1e8261d736b2ba2360bddeab20a5e18ca89c5f2f811a18388b65933210f6ec90b84e3e0f1f2083cfd5d43876dc5bb2b1102ad9829
WEB_SITE=http://wolfpack.twu.net/YIFF/
ENTERED=20050110
LICENSE[0]=GPL2
diff --git a/audio-drivers/yiff/HISTORY b/audio-drivers/yiff/HISTORY
index 94d0ca5..573c5e8 100644
--- a/audio-drivers/yiff/HISTORY
+++ b/audio-drivers/yiff/HISTORY
@@ -1,3 +1,10 @@
+2006-11-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: 2.14.5
+ * DEPENDS: made gtk+ optional, added optional alsa-lib
+ * BUILD: fix compilation; fix man path
+ * INSTALL: install everything
+ the whole lot fixes #12707
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/audio-drivers/yiff/INSTALL b/audio-drivers/yiff/INSTALL
index b64fbec..7a0f39b 100755
--- a/audio-drivers/yiff/INSTALL
+++ b/audio-drivers/yiff/INSTALL
@@ -1,2 +1 @@
-
-make install_noserver
+make install clean
diff --git a/audio-players/dcd/BUILD b/audio-players/dcd/BUILD
index bf512c9..8d38911 100755
--- a/audio-players/dcd/BUILD
+++ b/audio-players/dcd/BUILD
@@ -1,10 +1,2 @@
-(
- sedit "s/NET = true/# NET = true/" Makefile
- sedit "s/UNKNOWN_CD = true/# UNKNOWN_CD = true/" Makefile
- sedit "s/\/dev\/cdroms\/cdrom0/\/devices\/cdroms\/cdrom0/" Makefile
-
- make PREFIX=/usr &&
- prepare_install &&
- make PREFIX=/usr install
-
-) > $C_FIFO 2>&1
+sed -i 's,/man/,/share&,' Makefile
+make CDROM=/dev/cdrom
diff --git a/audio-players/dcd/DEPENDS b/audio-players/dcd/DEPENDS
new file mode 100755
index 0000000..e56d019
--- /dev/null
+++ b/audio-players/dcd/DEPENDS
@@ -0,0 +1,2 @@
+depends libmusicbrainz &&
+depends g++
diff --git a/audio-players/dcd/DETAILS b/audio-players/dcd/DETAILS
index e51136f..ed65f75 100755
--- a/audio-players/dcd/DETAILS
+++ b/audio-players/dcd/DETAILS
@@ -1,17 +1,14 @@
SPELL=dcd
- VERSION=0.95
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=0.99.2
+ SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.technopagan.org/$SPELL/$SOURCE
+ SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}player/$SOURCE
WEB_SITE=http://www.technopagan.org/dcd
+
SOURCE_HASH=sha512:bbb3f315ad042b5d98d9ba22e5a42a87540ceea681b5c80c77c3831c19d6ddcee9b643b967c15b0ddeb2aa16b49dea52ce4eb9fb7d52b87b39e0054fa216b74a
ENTERED=20010922
- UPDATED=20011215
ARCHIVE="off"
-
SOURCE_HASH=sha512:12e9af435ba857e6b3f65881303ff72b349f0645b2649ffb39b17ffa4ab7f16e0f84d385f24cfd32e386185d78abc575cf326a05febfe0acc56b286a64ac6ff2
- LICENSE[0]=GPL
- MAINTAINER=unet AT sourcemage.org
+ LICENSE[0]=GPL
KEYWORDS="players player audio"
- BUILD_API=1
SHORT="dcd is a simple command-line CD player."
cat << EOF
dave's cd player (dcd) is a simple command-line CD player. It plays
diff --git a/audio-players/dcd/HISTORY b/audio-players/dcd/HISTORY
index f9e08e3..7da0e2b 100644
--- a/audio-players/dcd/HISTORY
+++ b/audio-players/dcd/HISTORY
@@ -1,3 +1,9 @@
+2006-11-09 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * BUILD: convert to build api 2, simplify, fix #10733, fix man
install path
+ * DETAILS: bump to 0.99.2
+ * DEPENDS: added
+ * PREPARE: removed, not needed
+
2006-06-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: inserted BUILD_API=1 line

diff --git a/audio-players/dcd/PREPARE b/audio-players/dcd/PREPARE
deleted file mode 100755
index a4866ca..0000000
--- a/audio-players/dcd/PREPARE
+++ /dev/null
@@ -1,8 +0,0 @@
-#simple hack to remove old cache before it becomes a problem
-#PREPARE doesn't know version, atleast old version is covered by "prune"
-NUMBER="$(grep VERSION= $SCRIPT_DIRECTORY/DETAILS | cut -d= -f2)"
-OLDCACHE="$INSTALL_CACHE/$SPELL-$NUMBER-$BUILD.tar.bz2"
-if [ -f $OLDCACHE ] ;
-then rm -rf $OLDCACHE
-fi &&
-message "${SPELL_COLOR} ${SPELL} won't ARCHIVE installed
files${DEFAULT_COLOR}"
diff --git a/audio-players/xmms2/DEPENDS b/audio-players/xmms2/DEPENDS
index 788baec..2f232bb 100755
--- a/audio-players/xmms2/DEPENDS
+++ b/audio-players/xmms2/DEPENDS
@@ -99,7 +99,8 @@ optional_depends ruby
optional_depends JAVA \
"" \
"java" \
- "For java bindings." &&
+ "For java bindings." \
+ "z-rejected" &&
optional_depends ecore \
"" \
"xmmsclient-ecore" \
diff --git a/audio-players/xmms2/HISTORY b/audio-players/xmms2/HISTORY
index a92e85c..d4ff680 100644
--- a/audio-players/xmms2/HISTORY
+++ b/audio-players/xmms2/HISTORY
@@ -1,3 +1,6 @@
+2006-11-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: java is in z-rejected
+
2006-10-06 Juuso Alasuutari <iuso AT sourcemage.org>
* DEPENDS: Changed jack to JACK-DRIVER.

diff --git a/chat-im/gnomemeeting/BUILD b/chat-im/gnomemeeting/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/chat-im/gnomemeeting/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/chat-im/gnomemeeting/DEPENDS b/chat-im/gnomemeeting/DEPENDS
deleted file mode 100755
index c1261df..0000000
--- a/chat-im/gnomemeeting/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends ekiga
diff --git a/chat-im/gnomemeeting/DETAILS b/chat-im/gnomemeeting/DETAILS
deleted file mode 100755
index 498bf9b..0000000
--- a/chat-im/gnomemeeting/DETAILS
+++ /dev/null
@@ -1,27 +0,0 @@
- SPELL=gnomemeeting
-if [ "$CVS" == "y" ]; then
- VERSION=cvs
-# SOURCE=$SPELL-$VERSION.tar.gz
-# SOURCE_URL[0]=http://snapshots.seconix.com/cvs/$SOURCE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
- FORCE_DOWNLOAD=1
-# SOURCE_IGNORE=volatile
-else
- VERSION=1.2.2
-# SOURCE=$SPELL-$VERSION.tar.gz
-#
SOURCE_URL[0]=http://www.gnomemeeting.org/admin/downloads/latest/sources/sources/$SOURCE
-# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-fi
- GCC_VERSION=3.4
- LICENSE=GPL
- WEB_SITE=http://www.gnomemeeting.org
- ENTERED=20020508
- UPDATED=20060119
- KEYWORDS="messaging chat"
- SHORT="H323 videoconference tool"
-cat << EOF
-GnomeMeeting is the first Linux H.323 compatible client designed for the
Gnome desktop.
-It is compatible with Netmeeting and other H.323 products. It is the first
free H323
-videoconference tool with a powerfull GUI interface to be available under
GNU/Linux.
-EOF
diff --git a/chat-im/gnomemeeting/FINAL b/chat-im/gnomemeeting/FINAL
deleted file mode 100755
index ffb37f1..0000000
--- a/chat-im/gnomemeeting/FINAL
+++ /dev/null
@@ -1,7 +0,0 @@
-message "${PROBLEM_COLOR}cvs version of gnomemeeting is now called ekiga"
&&
-message "$If ${SPELL_COLOR}ekiga${PROBLEM_COLOR} fails to start" \
- "due to gconf error try :\n" \
- "$ chmod -R 4755 /etc/gconf/gconf.xml.defaults/\n" \
- "$ killall -9 gconfd-2\n" \
-
"http://www.gnomemeeting.org/index.php?rub=3&pos=0&faqpage=x304.html#AEN380${DEFAULT_COLOR}";
-
diff --git a/chat-im/gnomemeeting/HISTORY b/chat-im/gnomemeeting/HISTORY
deleted file mode 100644
index 921a964..0000000
--- a/chat-im/gnomemeeting/HISTORY
+++ /dev/null
@@ -1,116 +0,0 @@
-2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
- * DETAILS: (automated) Add KEYWORDS
-
-2006-01-20 George Sherwood <george AT beernabeer.com>
- * ALL: Deprecated spell. Will not build and is replaced by ekiga.
-
-2006-01-19 George Sherwood <george AT beernabeer.com>
- * BUILD: Added $OPTS to configure
-
-2006-01-13 George Sherwood <george AT beernabeer.com>
- * FINAL: Added message to deal with name change (for now) and
- common problem I have seen.
-
-2006-01-06 George Sherwood <george AT beernabeer.com>
- * DETAILS: Updated to use cvs snapshot. Removed BUILD_API=2
- Update to use GPG checking. Update SOURCE/SOURCE_DIRECTORY for cvs
- * DEPENDS: cvs depends on opal. Removed depends automake-1.7
- * BUILD: Added configure to build.
-
-2005-11-30 Seth Woolley <seth AT tautology.org>
- * DETAILS: MD5 IGNORE to SOURCE_HASH volatile
-
-2005-09-07 George Sherwood <george AT beeranbeer.com>
- * DETAILS: Updated to version 1.2.2
-
-2005-05-01 George Sherwood <george AT beernabeer.com>
- * DETAILS,DEPENDS: Updated to use gcc34
-
-2005-03-08 George Sherwood <george AT beernabeer.com>
- * DETAILS: Updated to version 1.2.1
-
-2005-02-01 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * BUILD, PRE_BUILD: made it simpler, and a minor autogen.sh fix
-
-2004-12-13 George Sherwood <george AT beernabeer.com>
- * PREPARE: Added option for gtk only
- * BUILD: Added option for gtk only
- * DEPENDS: Changed depends for with gnome and without
-
-2004-12-12 George Sherwood <george AT beernabeer.com>
- * DETAILS: Updated to version 1.2
- * DEPENDS: added depends evolution-data-server
- added optional depends howl
-
-2004-09-06 Robin Cook <rcook AT wyrms.net>
- * PREPARE: added for CVS config_query
- * DETAILS: added CVS download option
- added BUILD_API=2
- * DEPENDS: removed gtk+2 and glib2
- added sdl and arts as optionals
- added CVS depends of automake-1.7
- * BUILD: modified for BUILD_API=2
-
-2004-08-16 Flavien Bridault <falvien.bridault AT free.fr>
- * DETAILS: moved openh323 and pwlib to separate spells
-
-2004-08-03 Eric Sandall <eric AT sandall.us>
- * DEPENDS: SDL renamed to sdl
- Formatted to Guru Handbook
- * HISTORY: Formatted to Guru Handbook
-
-2004-05-22 George Sherwood <george AT beernabeer.com>
- * DETAILS: updated gnomemeeting to 1.02
- updated pwlib to 1.6.5
- updated openh323 to 1.13.4
- * BUILD: small adjusts to get to build
- * WIP: segfault during build of openh323
-
-2003-11-26 hgg <hgreig AT bigpond.net.au>
- * DETAILS: update gnomemeeting and openh but leave the pwlib (bison
error)
- * BUILD: fix an xml bug in xdap.c
-
-2003-08-16 hgg <hgreig AT bigpond.net.au>
- * DETAILS: Update to 0.98.0(official release 0.98.1 is cvs snapshot)
-
-2003-04-18 Seth Woolley <seth AT tautology.org>
- * DETAILS: MOdified to fix md5 for SOURCE[2].
- Modified to fix md5 for SOURCE[1].
-
-2003-04-08 M.L. <mlubrano AT sourcemage.org>
- * BUILD: Added $OPTS.
-
-2003-03-21 Adam Clark <adamsgl AT dhbit.ca>
- * DETAILS: Updated to 0.96.1
- Added fixes & suggestions as per Bug 2732. Thanks
- to Robin Cook.
-
-2003-02-24 Adam Clark <adamsgl AT dhbit.ca>
- * DETAILS: Updated to 0.96.0 - fixes from bug 2433
-
-2003-01-05 Adam Clark <adamsgl AT dhbit.ca>
- * Fixed Bug 2128 - I have no idea how this bug even came to be.
-
-2002-10-25 Adam Clark <adamsgl AT dhbit.ca>
- * DETAILS: Updated to 0.94.1
-
-2002-10-22 Adam Clark <adamsgl AT dhbit.ca>
- * DTEAILS: Removed sourcemage mirror URL - redundant (Bug 1332)
-
-2002-09-13 Adam Clark <adamsgl AT dhbit.ca>
- * DETAILS: Updated to 0.93.1
- * DEPENDS: Now requires Gnome2
-
-2002-06-25 Adam Clark <adamsgl AT dhbit.ca>
- * DETAILS: Fixed moved source & added MD5 & LICENSE fields
-
-2002-05-20 Adam Clark <adamsgl AT dhbit.ca>
- * Tested and added into grimoire.
-
-2002-05-20 Zoran Constantinescu <zoran AT idi.ntnu.no>
- * DEPENDS: Updated
- * HISTORY: Added
-
-2002-05-08 Zoran Constantinescu <zoran AT idi.ntnu.no>
- * Created spell.
-
diff --git a/chat-im/gnomemeeting/INSTALL b/chat-im/gnomemeeting/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/chat-im/gnomemeeting/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/chat-im/gnomemeeting/PREPARE b/chat-im/gnomemeeting/PREPARE
deleted file mode 100755
index fd6b481..0000000
--- a/chat-im/gnomemeeting/PREPARE
+++ /dev/null
@@ -1,3 +0,0 @@
-config_query CVS "Would you like to build the latest cvs version?" n
-config_query GTK_ONLY "Build using only gtk+2 vice gnome libs? " n
-
diff --git a/chat-im/gnomemeeting/PRE_BUILD b/chat-im/gnomemeeting/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/chat-im/gnomemeeting/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/chat-im/gnomemeeting/TRIGGERS b/chat-im/gnomemeeting/TRIGGERS
deleted file mode 100755
index 516c0d0..0000000
--- a/chat-im/gnomemeeting/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast gnomemeeting dispel_self
diff --git a/chat-im/gnomemeeting/gnomemeeting-1.2.2.tar.gz.sig
b/chat-im/gnomemeeting/gnomemeeting-1.2.2.tar.gz.sig
deleted file mode 100644
index 2476449..0000000
Binary files a/chat-im/gnomemeeting/gnomemeeting-1.2.2.tar.gz.sig and
/dev/null differ
diff --git a/chat-libs/linphone-im/BUILD b/chat-libs/linphone-im/BUILD
deleted file mode 100755
index 31a38c1..0000000
--- a/chat-libs/linphone-im/BUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-LDFLAGS="$LDFLAGS -L$SOURCE_DIRECTORY/speex/libspeex/.libs" &&
-
-if [[ "$CROSS_INSTALL" == on ]]; then
- OPTS="$OPTS --host=${HOST} --build=${BUILD}"
-fi &&
-invoke_gcc &&
-./configure --prefix=${INSTALL_ROOT}/usr \
- --sysconfdir=${INSTALL_ROOT}/etc \
- --localstatedir=${INSTALL_ROOT}/var \
- --mandir=${INSTALL_ROOT}/usr/share/man \
- --infodir=${INSTALL_ROOT}/usr/share/info \
- $OPTS &&
-cd libr263 &&
-sedit "s|CFLAGS\\s*=|\\0 $CFLAGS|g" Makefile &&
-make library &&
-cd ../speex &&
-make &&
-cd .. &&
-make
diff --git a/chat-libs/linphone-im/DEPENDS b/chat-libs/linphone-im/DEPENDS
deleted file mode 100755
index ef24892..0000000
--- a/chat-libs/linphone-im/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-depends gcc34 &&
-depends libosip
diff --git a/chat-libs/linphone-im/DETAILS b/chat-libs/linphone-im/DETAILS
deleted file mode 100755
index 92330f6..0000000
--- a/chat-libs/linphone-im/DETAILS
+++ /dev/null
@@ -1,15 +0,0 @@
- SPELL=linphone-im
- VERSION=0.1
- SOURCE=$SPELL.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
-SOURCE_URL[0]=$SOURCEFORGE_URL/gaim-vv/$SOURCE
-
SOURCE_HASH=sha512:70c4786b9e3988ca86234a10363072450338c74fb97cca739bfdfc78d790b584dae587ed2c3ad17bb4e0961618d7ad18ab8cacfe5feff69fce30c4bc8ac67a0d
- LICENSE[0]=GPL
- GCC_VERSION=3.4
- WEB_SITE=http://gaim-vv.sourceforge.net/
- ENTERED=20050112
- KEYWORDS="chat video libs"
- SHORT="plugin to provide video in gaim-vv"
-cat << EOF
-Plugin to provide video in gaim-vv
-EOF
diff --git a/chat-libs/linphone-im/HISTORY b/chat-libs/linphone-im/HISTORY
deleted file mode 100644
index ae0f710..0000000
--- a/chat-libs/linphone-im/HISTORY
+++ /dev/null
@@ -1,25 +0,0 @@
-2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
- * DETAILS: [automated] Removed UPDATED.
-
-2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
- * DETAILS: [automated] Removed BUILD_API=2.
-
-2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
- * DETAILS: (automated) Add KEYWORDS
-
-2006-02-27 George Sherwood <george AT beeranbeer.com>
- * INSTALL: Added. Bug #10600
- * POST_INSTALL: Deleted. Bug #10600
-
-2005-11-29 Seth Woolley <seth AT tautology.org>
- * DETAILS: MD5 -> SHA512
-
-2005-05-17 Sergey Lipnevich <sergey AT sourcemage.org>
- * BUILD: use our CFLAGS, useful on AMD64.
-
-2005-05-02 George Sherwood <george AT beernabeer.com>
- * DETAILS,BUILD,DEPENDS: updated to use gcc34
-
-2005-01-12 George Sherwood <george AT beernabeer.com>
- * ALL: added Spell
-
diff --git a/chat-libs/linphone-im/INSTALL b/chat-libs/linphone-im/INSTALL
deleted file mode 100755
index 371da12..0000000
--- a/chat-libs/linphone-im/INSTALL
+++ /dev/null
@@ -1,5 +0,0 @@
-default_install &&
-cd $SOURCE_DIRECTORY &&
-cp config.h /usr/include/linphone-im/linphone_config.h &&
-mkdir /usr/include/mediastreamer &&
-cp mediastreamer/*h /usr/include/mediastreamer
diff --git a/chat-libs/linphone-im/PRE_BUILD b/chat-libs/linphone-im/PRE_BUILD
deleted file mode 100755
index f0365c1..0000000
--- a/chat-libs/linphone-im/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-sedit 's/speex//' Makefile.in &&
-sedit 's/developer-docs//' Makefile.in &&
-sedit '/^SUBDIRS/ { s/docs//; }' oRTP/Makefile.in &&
-sedit '/^SUBDIRS/ { s/docs//; }' osipua/Makefile.in
-
diff --git a/chat-libs/openh323/BUILD b/chat-libs/openh323/BUILD
deleted file mode 100755
index 3dd6a97..0000000
--- a/chat-libs/openh323/BUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-make_single &&
-
-if [ "$CVS" == "y" ]; then
- export OPENH323DIR=$SOURCE_DIRECTORY &&
- cd $SOURCE_DIRECTORY &&
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- $OPTS &&
- make -j 1 optshared
-else
- ./configure --prefix=/usr $OPTS &&
-# patch -p0 < $SCRIPT_DIRECTORY/patch_openh323 &&
- LD_PRELOAD_OLD="$LD_PRELOAD" &&
- unset LD_PRELOAD &&
- make -j 1 &&
- export LD_PRELOAD="$LD_PRELOAD_OLD"
-fi &&
-
-make_normal
diff --git a/chat-libs/openh323/DEPENDS b/chat-libs/openh323/DEPENDS
deleted file mode 100755
index edceee0..0000000
--- a/chat-libs/openh323/DEPENDS
+++ /dev/null
@@ -1,7 +0,0 @@
-depends g++ &&
-depends pwlib &&
-
-optional_depends "speex" \
- "" \
- "" \
- "Use newer version than the one in openh323 source"
diff --git a/chat-libs/openh323/DETAILS b/chat-libs/openh323/DETAILS
deleted file mode 100755
index 885d2f2..0000000
--- a/chat-libs/openh323/DETAILS
+++ /dev/null
@@ -1,32 +0,0 @@
- SPELL=openh323
-if [ "$CVS" == "y" ]; then
- VERSION=cvs
- SOURCE=${SPELL}-${VERSION}.tar.bz2
-
SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs.sourceforge.net:/cvsroot/openh323:openh323
- SOURCE_IGNORE=volatile
- FORCE_DOWNLOAD=1
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
-else
- VERSION=1.15.6
- SOURCE=${SPELL}-${VERSION}.tar.gz
-
SOURCE_URL[0]=http://www.gnomemeeting.org/admin/downloads/latest/sources/sources/${SOURCE}
- SOURCE_URL[1]=${SOURCEFORGE_URL}/openh323/${SOURCE}
- SOURCE_HASH=sha1:4dffc58c1b2c10a20f8b9b3623af07248d59db55
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
-fi
- LICENSE[0]=GPL
- WEB_SITE=http://www.openh323.org
- ENTERED=20040409
- UPDATED=20040905
- SHORT="An H323 Library"
-cat << EOF
-The OpenH323 project aims to create a full featured, interoperable, Open
-Source implementation of the ITU H.323 teleconferencing protocol that can be
-used by personal developers and commercial users without charge.
-
-OpenH323 development is coordinated by an Australian company, Equivalence Pty
-Ltd (http://www.equival.com), but is open to any interested party. Commercial
-and private use of the OpenH323 code, including use in commercial products
-and resale, is enouraged through use of the MPL (Mozilla Public license).
-
-EOF
diff --git a/chat-libs/openh323/HISTORY b/chat-libs/openh323/HISTORY
deleted file mode 100644
index 979f1d8..0000000
--- a/chat-libs/openh323/HISTORY
+++ /dev/null
@@ -1,41 +0,0 @@
-2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
- * DETAILS: [automated] Removed BUILD_API=2.
-
-2005-11-30 Seth Woolley <seth AT tautology.org>
- * DETAILS: MD5 IGNORE to SOURCE_HASH volatile
-
-2005-09-07 George Sherwood <george AT beernabeer.com>
- * DETAILS: Updated to version 1.15.6
-
-2005-03-17 Eric Sandall <eric AT sandall.us>
- * DETAILS: Removed MAKE_NJOBS=1
- * BUILD: Run make_single before any makes
- Run make_normal at the end
- * HISTORY: Formatted to Guru Handbook
-
-2005-03-08 George Sherwood <george AT beernabeer.com>
- * DETAILS: Updated to version 1.15.3
-
-2004-12-12 George Sherwood <george AT beernabeer.com>
- * DETAILS: Updated to version 1_15_2
- * BUILD: Doesn't seem to need the patch now.
-
-2004-09-27 Clement MATHIEU <cykl AT mAdchAt.org>
- * DETAILS: fixed wrong MD5SUM
-
-2004-09-11 George Sherwood <george AT beernabeer.com>
- * DETAILS: fixed small typing error. Bug #7347
-
-2004-09-06 Robin Cook <rcook AT wyrms.net>
- * PREPARE: added for CVS config_query
- * DETAILS: added CVS download option
- added BUILD_API=2
- * DEPENDS: added g++
- added optional depends on speex
- * BUILD: modified for BUILD_API=2 and CVS build
- * NOTE: mainly modifed to be able to get cvs version to build
- cvs version of gnomemeeting.
-
-2004-08-12 Flavien Bridault <falvien.bridault AT free.fr>
- * Created spell.
-
diff --git a/chat-libs/openh323/PREPARE b/chat-libs/openh323/PREPARE
deleted file mode 100755
index 8064306..0000000
--- a/chat-libs/openh323/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query CVS "Would you like to build the latest cvs version?" n
diff --git a/chat-libs/openh323/patch_openh323
b/chat-libs/openh323/patch_openh323
deleted file mode 100644
index 52950d3..0000000
--- a/chat-libs/openh323/patch_openh323
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile 2004-08-12 12:15:17.793898040 +0200
-+++ Makefile 2004-08-12 12:16:14.828227504 +0200
-@@ -242,7 +242,7 @@
- # export NOAUDIOCODECS=true
- # export NOVIDEO=true
-
--SUBDIRS := src samples/simple
-+SUBDIRS := src
-
- ifneq (,$(wildcard dump323))
- SUBDIRS += dump323
---- src/Makefile 2004-08-12 11:01:34.167391488 +0200
-+++ src/Makefile 2004-08-12 11:01:56.718963128 +0200
-@@ -888,8 +888,8 @@
-
- # If we're cross compiling, we want the host's asnparser
- # otherwise use the one for the current platform
--ASNPARSE_DIR = $(HOSTPWLIBDIR)/tools/asnparser
--ASNPARSER = $(ASNPARSE_DIR)/obj_$(HOST_PLATFORM_TYPE)_r/asnparser
-+ASNPARSE_DIR = /usr/bin
-+ASNPARSER = $(ASNPARSE_DIR)/asnparser
-
-
- # If not cross compiling then make sure asnparser is built
diff --git a/devel/clearsilver/DEPENDS b/devel/clearsilver/DEPENDS
index d714986..4cf6568 100755
--- a/devel/clearsilver/DEPENDS
+++ b/devel/clearsilver/DEPENDS
@@ -1,5 +1,7 @@
-# Python required, e.g. see scripts/document.py
-depends python '--enable-python' &&
+optional_depends python \
+ "--with-python=$TRACK_ROOT/usr/bin/python" \
+ "--disable-python" \
+ "for the python module" &&

optional_depends gettext \
'--enable-gettext' \
diff --git a/devel/clearsilver/HISTORY b/devel/clearsilver/HISTORY
index d0c0721..cf24e21 100644
--- a/devel/clearsilver/HISTORY
+++ b/devel/clearsilver/HISTORY
@@ -1,3 +1,6 @@
+2006-11-19 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: python is optional; fixed the flag #12939
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/devel/eclipse/BUILD b/devel/eclipse/BUILD
index e951ca5..bd7c80f 100755
--- a/devel/eclipse/BUILD
+++ b/devel/eclipse/BUILD
@@ -35,9 +35,11 @@ fi &&
# TODO define arch and windowing system
# possible values are in ./build
ws=gtk &&
-if uname -m | grep -q 'i.\+86'; then
- arch=x86
-fi &&
+case "${SMGL_COMPAT_ARCH[2]}" in
+ ia32) arch=x86 ;;
+ x86_64) arch=x86_64 ;;
+ ppc) arch=ppc ;;
+esac &&
persistent_add ws &&
persistent_add arch &&
./build -os linux -ws "$ws" -arch "$arch" &&
diff --git a/devel/eclipse/HISTORY b/devel/eclipse/HISTORY
index 75088b1..1a66498 100644
--- a/devel/eclipse/HISTORY
+++ b/devel/eclipse/HISTORY
@@ -1,3 +1,7 @@
+2006-11-08 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * BUILD: added 64-bit #10448 and ppc support
+ Use $SMGL_COMPAT_ARCHS instead of uname
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/devel/graphviz/DEPENDS b/devel/graphviz/DEPENDS
index 152e2ae..5744606 100755
--- a/devel/graphviz/DEPENDS
+++ b/devel/graphviz/DEPENDS
@@ -11,7 +11,7 @@ depends gd '--without-mylibgd' &&
# not listed in 'configure --help' but nevertheless processed
optional_depends PHP '--enable-php' '--disable-php' 'for PHP bindings' &&
optional_depends perl '--enable-perl' '--disable-perl' 'for Perl bindings' &&
-optional_depends JAVA '--enable-java' '--disable-java' 'for Java bindings' &&
+optional_depends JAVA '--enable-java' '--disable-java' 'for Java bindings'
z-rejected &&
optional_depends ruby '--enable-ruby' '--disable-ruby' 'for Ruby bindings' &&
optional_depends python '--enable-python' '--disable-python' 'for Python
bindings' &&
optional_depends ocaml '--enable-ocaml' '--disable-ocaml' 'for Ocaml
bindings' &&
diff --git a/devel/graphviz/HISTORY b/devel/graphviz/HISTORY
index 049a90f..0cd396b 100644
--- a/devel/graphviz/HISTORY
+++ b/devel/graphviz/HISTORY
@@ -1,3 +1,6 @@
+2006-11-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: java is in z-rejected
+
2006-10-11 Maurizio Boriani <baux AT sourcemage.org>
* CONFIGURE: Add warning about guile major update.

diff --git a/devel/jruby/DEPENDS b/devel/jruby/DEPENDS
index 51cd504..0dfc7cc 100755
--- a/devel/jruby/DEPENDS
+++ b/devel/jruby/DEPENDS
@@ -1,2 +1,2 @@
depends ant &&
-depends JAVA
+depends JAVA z-rejected
diff --git a/devel/jruby/HISTORY b/devel/jruby/HISTORY
index 1eaa5ac..5cd0a29 100644
--- a/devel/jruby/HISTORY
+++ b/devel/jruby/HISTORY
@@ -1,3 +1,6 @@
+2006-11-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: java is in z-rejected #11106
+
2006-09-10 Pol Vinogradov <vin.public AT gmail.com>
* INSTALL: fixed destination path, wrong usage of VERSION

diff --git a/editors/lyx/HISTORY b/editors/lyx/HISTORY
index 1818a4b..db91036 100644
--- a/editors/lyx/HISTORY
+++ b/editors/lyx/HISTORY
@@ -1,6 +1,7 @@
2006-11-12 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DEPENDS: use runtime_depends; generic browser
* PRE_BUILD: fix the substitution for WEB-BROWSER #13062
+ * POST_REMOVE, REPAIR^none^POST_REMOVE: added to fix #11730

2006-09-23 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to 1.4.3. Removed UPDATED.
diff --git a/editors/lyx/POST_REMOVE b/editors/lyx/POST_REMOVE
new file mode 100755
index 0000000..e2a0b14
--- /dev/null
+++ b/editors/lyx/POST_REMOVE
@@ -0,0 +1 @@
+find $INSTALL_ROOT/var/tmp/texfonts/ -type d -name jknappen -exec rm -rf {}
\;
diff --git a/editors/lyx/REPAIR^none^POST_REMOVE
b/editors/lyx/REPAIR^none^POST_REMOVE
new file mode 100755
index 0000000..e2a0b14
--- /dev/null
+++ b/editors/lyx/REPAIR^none^POST_REMOVE
@@ -0,0 +1 @@
+find $INSTALL_ROOT/var/tmp/texfonts/ -type d -name jknappen -exec rm -rf {}
\;
diff --git a/ftp/dctc/CONFIGURE b/ftp/dctc/CONFIGURE
new file mode 100755
index 0000000..f75d9ff
--- /dev/null
+++ b/ftp/dctc/CONFIGURE
@@ -0,0 +1 @@
+config_query_list DCTC_MD4 "Which MD4 provider?" openssl libgcrypt both
diff --git a/ftp/dctc/DEPENDS b/ftp/dctc/DEPENDS
index 8bed970..ea21df6 100755
--- a/ftp/dctc/DEPENDS
+++ b/ftp/dctc/DEPENDS
@@ -1,3 +1,11 @@
+if [[ "x${DCTC_MD4}" == "xopenssl" ]]; then
+ depends openssl
+elif [[ "x${DCTC_MD4}" == "xlibgcrypt" ]]; then
+ depends libgcrypt
+else
+ depends openssl &&
+ depends libgcrypt
+fi &&
depends gcc34 &&
depends glib2 &&
depends libxml2
diff --git a/ftp/dctc/HISTORY b/ftp/dctc/HISTORY
index a31f728..fc71293 100644
--- a/ftp/dctc/HISTORY
+++ b/ftp/dctc/HISTORY
@@ -1,3 +1,7 @@
+2006-11-20 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DEPENDS, CONFIGURE: fixed bug 12219: depend on openssl or
+ * libgcrypt for md4.
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/groups b/groups
index 84646d9..cbe9f7b 100755
--- a/groups
+++ b/groups
@@ -15,6 +15,7 @@ cdrom:24:
floppy:25:
audio:29:
www-data:33:
+backup:34:
utmp:43:
games:60:
firebird:84:
diff --git a/http/apache2/BUILD b/http/apache2/BUILD
index cc52a35..93d01a6 100755
--- a/http/apache2/BUILD
+++ b/http/apache2/BUILD
@@ -1,6 +1,9 @@
# remove APR and APU and reconfigure to use external ones
rm -fr srclib/apr*/ &&

+# use smgl standard layout
+cp -f $SCRIPT_DIRECTORY/config.layout $SOURCE_DIRECTORY &&
+
./buildconf --with-apr=/usr/share/apache2 \
--with-apr-util=/usr/share/apache2 &&

@@ -8,7 +11,7 @@ rm -fr srclib/apr*/ &&
--sysconfdir=$INSTALL_ROOT/etc/httpd \
--localstatedir=$INSTALL_ROOT/var \
--mandir=$INSTALL_ROOT/usr/share/man \
- --enable-layout=GNU \
+ --enable-layout=SMGL \
--enable-modules=most \
$OPTS &&
make
diff --git a/http/apache2/HISTORY b/http/apache2/HISTORY
index cdecb89..26b7514 100644
--- a/http/apache2/HISTORY
+++ b/http/apache2/HISTORY
@@ -1,3 +1,7 @@
+2006-10-21 George Sherwood <george AT beernabeer.com>
+ * BUILD: cp config.layout file. Use SMGL layout. Bug #13051.
+ * config.layout: added file for SMGL layout
+
2006-09-29 Arjan Bouter <abouter AT sourcemage.org>
* CONFLICTS: added apache22 to the list

diff --git a/http/apache2/config.layout b/http/apache2/config.layout
new file mode 100644
index 0000000..5621559
--- /dev/null
+++ b/http/apache2/config.layout
@@ -0,0 +1,35 @@
+##
+## config.layout -- Pre-defined Installation Path Layouts
+##
+## Hints:
+## - layouts can be loaded with configure's --enable-layout=ID option
+## - when no --enable-layout option is given, the default layout is `Apache'
+## - a trailing plus character (`+') on paths is replaced with a
+## `/<target>' suffix where <target> is currently hardcoded to 'apache2'.
+## (This may become a configurable parameter at some point.)
+##
+
+# Source Mage standard path layout.
+<Layout SMGL>
+ prefix: ${INSTALL_ROOT}/usr
+ exec_prefix: ${prefix}
+ bindir: ${exec_prefix}/bin
+ sbindir: ${exec_prefix}/sbin
+ libdir: ${exec_prefix}/lib
+ libexecdir: ${exec_prefix}/libexec
+ mandir: ${prefix}/share/man
+ sysconfdir: ${prefix}/etc+
+ datadir: ${INSTALL_ROOT}/var/www+
+ installbuilddir: ${datadir}/build
+ errordir: ${datadir}/error
+ iconsdir: ${datadir}/icons
+ htdocsdir: ${datadir}/htdocs
+ manualdir: ${datadir}/manual
+ cgidir: ${datadir}/cgi-bin
+ includedir: ${prefix}/include+
+ localstatedir: ${INSTALL_ROOT}/var
+ runtimedir: ${localstatedir}/run
+ logfiledir: ${localstatedir}/log+
+ proxycachedir: ${localstatedir}/proxy
+</Layout>
+
diff --git a/kernels/lm_sensors/HISTORY b/kernels/lm_sensors/HISTORY
index a86194d..2f9cba6 100644
--- a/kernels/lm_sensors/HISTORY
+++ b/kernels/lm_sensors/HISTORY
@@ -1,3 +1,6 @@
+2006-11-01 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * PRE_BUILD: added to fix man path #10230
+
2006-09-26 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.10.1, new WEB_SITE and SOURCE_URLs

diff --git a/kernels/lm_sensors/PRE_BUILD b/kernels/lm_sensors/PRE_BUILD
new file mode 100755
index 0000000..97bece3
--- /dev/null
+++ b/kernels/lm_sensors/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i 's,MANDIR := $(PREFIX)/man,MANDIR := $(PREFIX)/share/man,' Makefile
diff --git a/libcompat b/libcompat
index f900c37..b654e6e 100755
--- a/libcompat
+++ b/libcompat
@@ -53,3 +53,15 @@ declare -f runtime_depends &> /dev/null
function runtime_depends() {
depends "$@"
}
+
+declare -f is_depends_enabled &>/dev/null ||
+function is_depends_enabled() {
+ local dep_status
+ if [[ $3 ]] ; then
+ dep_status=$DEPENDS_STATUS
+ else
+ dep_status=$(hash_get uncommitted_hash $1)
+ [[ $dep_status ]] || dep_status=$DEPENDS_STATUS
+ fi
+ grep -q "^[[:space:]]*$1:$2:on" $dep_status
+}
diff --git a/libs/mpfr/BUILD b/libs/mpfr/BUILD
deleted file mode 100755
index b2f9212..0000000
--- a/libs/mpfr/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-autoreconf &&
-default_build
diff --git a/libs/mpfr/DEPENDS b/libs/mpfr/DEPENDS
index d6bc0f6..e2b10a2 100755
--- a/libs/mpfr/DEPENDS
+++ b/libs/mpfr/DEPENDS
@@ -1,4 +1 @@
-depends gmp &&
-depends CVS &&
-depends automake &&
-depends autoconf
+depends gmp
diff --git a/libs/mpfr/DETAILS b/libs/mpfr/DETAILS
index 3c62378..27673f1 100755
--- a/libs/mpfr/DETAILS
+++ b/libs/mpfr/DETAILS
@@ -1,14 +1,18 @@
- SPELL=mpfr
- VERSION=2.1-branch
- SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_URL[0]=cvs://:pserver:cvs AT cvs-sop.inria.fr:/CVS/spaces:mpfr:mpfr-2-1-branch
- SOURCE_IGNORE=volatile
- WEB_SITE=http://www.mpfr.org/
- ENTERED=20040218
- LICENSE[0]=LGPL
- KEYWORDS="libs"
- SHORT="Multiple-precision floating point library with exact
rounding"
+ SPELL=mpfr
+ VERSION=2.2.0
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=patches #a cummulative patch
+ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://www.mpfr.org/mpfr-current/$SOURCE
+ SOURCE2_URL[0]=http://www.mpfr.org/mpfr-current/$SOURCE2
+
SOURCE_HASH=sha512:e8ce29050d5b933c533a6f72771c56a93a3d3594a753b0d8fd782f40bcd57181f01ed39aa2c0015dd3edda8f9c1d94c3eba09eb897d8027ad29e8a03ebb5e2f4
+ SOURCE2_IGNORE=volatile
+FORCE_DOWNLOAD[2]=on
+ WEB_SITE=http://www.mpfr.org/
+ ENTERED=20040218
+ LICENSE[0]=LGPL
+ KEYWORDS="libs"
+ SHORT="Multiple-precision floating point library with exact
rounding"
cat << EOF
The MPFR library is a C library for multiple-precision floating-point
computations with exact rounding (also called correct rounding).
diff --git a/libs/mpfr/HISTORY b/libs/mpfr/HISTORY
index aa302ae..9e7f0c0 100644
--- a/libs/mpfr/HISTORY
+++ b/libs/mpfr/HISTORY
@@ -1,3 +1,9 @@
+2006-11-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: updated to 2.2.0; use a tarball and the cummulative patch
+ * DEPENDS: removed unneeded depends
+ * BUILD: removed
+ * PRE_BUILD: added to apply the patch
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/libs/mpfr/PRE_BUILD b/libs/mpfr/PRE_BUILD
new file mode 100755
index 0000000..46180c4
--- /dev/null
+++ b/libs/mpfr/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SOURCE_CACHE/patches
+
+#this will get downloaded anew everytime anyway; avoiding generic file name
+rm $SOURCE_CACHE/patches
diff --git a/mail/mutt/HISTORY b/mail/mutt/HISTORY
index 87da52c..111377a 100644
--- a/mail/mutt/HISTORY
+++ b/mail/mutt/HISTORY
@@ -1,3 +1,6 @@
+2006-11-11 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * PATCH_ORDER, patches/xtitles/: added xtitles patch #10936
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* PROVIDES: [automated] Fixed invalid entries.

diff --git a/mail/mutt/patches/PATCH_ORDER b/mail/mutt/patches/PATCH_ORDER
index 257b08d..6ed152a 100644
--- a/mail/mutt/patches/PATCH_ORDER
+++ b/mail/mutt/patches/PATCH_ORDER
@@ -15,3 +15,4 @@ date_conditional
current_shortcut
indexcolor
libesmtp
+xtitles
diff --git a/mail/mutt/patches/xtitles/PATCH_DETAILS
b/mail/mutt/patches/xtitles/PATCH_DETAILS
new file mode 100755
index 0000000..e70ec9e
--- /dev/null
+++ b/mail/mutt/patches/xtitles/PATCH_DETAILS
@@ -0,0 +1,3 @@
+PATCH_SITE="http://does-not-exist.org/mail-archives/mutt-dev/msg02073.html";
+PATCH_BRANCHES="devel cvs"
+PATCH_SOURCE="patch-1.5.5.1.nt.xtitles.3.ab.1"
diff --git a/mail/mutt/patches/xtitles/patch-1.5.5.1.nt.xtitles.3.ab.1.bz2
b/mail/mutt/patches/xtitles/patch-1.5.5.1.nt.xtitles.3.ab.1.bz2
new file mode 100644
index 0000000..6ea9145
Binary files /dev/null and
b/mail/mutt/patches/xtitles/patch-1.5.5.1.nt.xtitles.3.ab.1.bz2 differ
diff --git a/net/iptraf/DETAILS b/net/iptraf/DETAILS
index 8411fc8..de60df3 100755
--- a/net/iptraf/DETAILS
+++ b/net/iptraf/DETAILS
@@ -1,12 +1,11 @@
SPELL=iptraf
- VERSION=2.7.0
+ VERSION=3.0.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://iptraf.seul.org/pub/iptraf/$SOURCE
WEB_SITE=http://cebu.mozcom.com/riker/iptraf/
-
SOURCE_HASH=sha512:6adce8d0b43c3aa06f361adce2076abcc024e6c723c30170284289d08d7193c051c14c375483174f7e4b1aad4468f9f4b68873040f47ed9554af703c4c7b3cd6
+
SOURCE_HASH=sha512:f98064105a850ebd92675e6bd2d3ed5361c238f198f309f3960e1905ebb00dbbf52e3f5daea0b9e157c6dc3c55db7b0c0a1adcafce928dbd4a2cd9c9225dcdb3
ENTERED=20020202
- UPDATED=20020528
KEYWORDS="net"
SHORT="IPTraf is a console-based network statistics utility"
cat << EOF
diff --git a/net/iptraf/HISTORY b/net/iptraf/HISTORY
index 2da562e..76a8e7f 100644
--- a/net/iptraf/HISTORY
+++ b/net/iptraf/HISTORY
@@ -1,3 +1,9 @@
+2006-11-11 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * slightly modified patch from Renan Merour fixing #11506:
+ * DETAILS: Version bump to 3.0.0
+ * PRE_BUILD: Conditional patch to compile with kernel-2.6 headers
+ * iptraf_headers.patch: patch for 2.6 linux headers.
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/net/iptraf/PRE_BUILD b/net/iptraf/PRE_BUILD
new file mode 100755
index 0000000..6cfb1c5
--- /dev/null
+++ b/net/iptraf/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY/src &&
+local KVER=$(get_kernel_version) &&
+if [[ ${KVER:0:3} == 2.6 ]]; then
+ patch -p2 < ${SPELL_DIRECTORY}/iptraf_headers.patch
+fi
diff --git a/net/iptraf/iptraf_headers.patch b/net/iptraf/iptraf_headers.patch
new file mode 100644
index 0000000..ebf7d02
--- /dev/null
+++ b/net/iptraf/iptraf_headers.patch
@@ -0,0 +1,60 @@
+diff -Naur iptraf-3.0.0_orig/src/install.sh iptraf-3.0.0/src/install.sh
+--- iptraf-3.0.0_orig/src/install.sh 2002-12-26 04:07:18.000000000 +0100
++++ iptraf-3.0.0/src/install.sh 2006-08-21 21:07:42.000000000 +0200
+@@ -85,7 +85,7 @@
+ echo "this version. You can view this file now (will require the 'less'"
+ echo "program in /usr/bin. Press Q to quit when done)."
+ echo
+-echo -n "Would you like to view the RELEASE-NOTES file now (Y/N)? "; read
YESNO
++echo -n "Would you like to view the RELEASE-NOTES file now (Y/N)? "; YESNO
== y
+
+ if [ "$YESNO" = "y" -o "$YESNO" = "Y" ]; then
+ less ../RELEASE-NOTES
+diff -Naur iptraf-3.0.0_orig/src/Makefile iptraf-3.0.0/src/Makefile
+--- iptraf-3.0.0_orig/src/Makefile 2005-09-13 11:11:17.000000000 +0200
++++ iptraf-3.0.0/src/Makefile 2006-08-21 21:07:42.000000000 +0200
+@@ -68,12 +68,12 @@
+ # installation target directory. The iptraf and rvnamed programs get
+ # stored here. iptraf also exec's rvnamed from this directory.
+
+-TARGET = /usr/local/bin
++TARGET = /usr/bin
+
+ # The IPTraf working directory; if you change this. Starting with this
+ # version, this definition overrides dirs.h.
+
+-WORKDIR = /var/local/iptraf
++WORKDIR = /var/iptraf
+
+ # The IPTraf log file directory. IPTraf log files are placed here.
+ # This definition overrides dirs.h
+diff -Naur iptraf-3.0.0_orig/src/othptab.c iptraf-3.0.0/src/othptab.c
+--- iptraf-3.0.0_orig/src/othptab.c 2005-09-13 08:42:54.000000000 +0200
++++ iptraf-3.0.0/src/othptab.c 2006-08-21 21:14:49.000000000 +0200
+@@ -18,8 +18,8 @@
+
+ #include <asm/types.h>
+ #include <linux/if_ether.h>
+-#include <linux/if_tr.h>
+-#include <linux/if_fddi.h>
++/*#include <linux/if_tr.h>*/
++/*#include <linux/if_fddi.h>*/
+ #include <winops.h>
+ #include "arphdr.h"
+ #include "options.h"
+diff -Naur iptraf-3.0.0_orig/src/tcptable.h iptraf-3.0.0/src/tcptable.h
+--- iptraf-3.0.0_orig/src/tcptable.h 2005-09-13 08:42:54.000000000 +0200
++++ iptraf-3.0.0/src/tcptable.h 2006-08-21 21:13:25.000000000 +0200
+@@ -20,11 +20,11 @@
+ #include <arpa/inet.h>
+ #include <net/if_arp.h>
+ #include <asm/types.h>
++#include <net/if.h>
+ #include <linux/if_packet.h>
+ #include <linux/if_ether.h>
+ #include <linux/if_fddi.h>
+ #include <linux/if_tr.h>
+-#include <net/if.h>
+ #include <netinet/ip.h>
+ #include <netinet/udp.h>
+ #include "servname.h"
diff --git a/net/mtr/CONFIGURE b/net/mtr/CONFIGURE
new file mode 100755
index 0000000..08446c2
--- /dev/null
+++ b/net/mtr/CONFIGURE
@@ -0,0 +1 @@
+config_query MTR_SUID "Install mtr setuid (recommended)" y
diff --git a/net/mtr/DETAILS b/net/mtr/DETAILS
index a91abb8..314f2c3 100755
--- a/net/mtr/DETAILS
+++ b/net/mtr/DETAILS
@@ -6,7 +6,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL

SOURCE_HASH=sha512:c97edb374169f1f89c4eea140f075c6f050fa4f1e1a991961868c963ef70a26ce7eb7627bcecd8d7913e2790f45447b0db3e1edfcb4b37ffac900c3394faa104
WEB_SITE=http://www.bitwizard.nl/mtr/
ENTERED=20010922
- UPDATED=20041211
+ PATCHLEVEL=1
KEYWORDS="net"
SHORT="mtr combines the functionality of 'traceroute' and 'ping'"
cat << EOF
diff --git a/net/mtr/HISTORY b/net/mtr/HISTORY
index 68373ef..c827b1d 100644
--- a/net/mtr/HISTORY
+++ b/net/mtr/HISTORY
@@ -1,3 +1,8 @@
+2006-11-19 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * CONFIGURE: added to query for suid #11860
+ * INSTALL: respect suid; use the provided install and install
everything
+ * DETAILS: ++PATCHLEVEL
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/net/mtr/INSTALL b/net/mtr/INSTALL
index 61c2606..6beaa28 100755
--- a/net/mtr/INSTALL
+++ b/net/mtr/INSTALL
@@ -1 +1,4 @@
-install -m 755 mtr $INSTALL_ROOT/usr/sbin
+make install &&
+if [[ $MTR_SUID == n ]]; then
+ chmod a-s $INSTALL_ROOT/usr/sbin/mtr
+fi
diff --git a/security-libs/nessus-libraries/DEPENDS
b/security-libs/nessus-libraries/DEPENDS
index 47ddb08..bbfdec7 100755
--- a/security-libs/nessus-libraries/DEPENDS
+++ b/security-libs/nessus-libraries/DEPENDS
@@ -1,7 +1,3 @@
depends bison &&
depends flex &&
-
-optional_depends openssl \
- "--enable-cipher" \
- "--disable-cipher" \
- "for SSL cipher support"
+depends openssl "--enable-cipher"
diff --git a/security-libs/nessus-libraries/HISTORY
b/security-libs/nessus-libraries/HISTORY
index 973587a..55dda96 100644
--- a/security-libs/nessus-libraries/HISTORY
+++ b/security-libs/nessus-libraries/HISTORY
@@ -1,3 +1,6 @@
+2006-10-21 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: depend on openssl unconditionally #11945
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/shell-term-fm/fish/DEPENDS b/shell-term-fm/fish/DEPENDS
index 9d56afa..0a6cc0d 100755
--- a/shell-term-fm/fish/DEPENDS
+++ b/shell-term-fm/fish/DEPENDS
@@ -1 +1,2 @@
-depends doxygen
+depends doxygen &&
+depends bc
diff --git a/shell-term-fm/fish/HISTORY b/shell-term-fm/fish/HISTORY
index 9356ffc..08386d0 100644
--- a/shell-term-fm/fish/HISTORY
+++ b/shell-term-fm/fish/HISTORY
@@ -1,3 +1,6 @@
+2006-11-08 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: added bc #10766
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/shell-term-fm/screen/CONFIGURE b/shell-term-fm/screen/CONFIGURE
index f4618f8..ad3fbf0 100755
--- a/shell-term-fm/screen/CONFIGURE
+++ b/shell-term-fm/screen/CONFIGURE
@@ -1,8 +1,6 @@
-
-if ! grep -q "REPLACE_RC" $SPELL_CONFIG; then
- if query "Override your /etc/screenrc with new one ?" n
- then echo "REPLACE_RC=y" >> $SPELL_CONFIG
- else echo "REPLACE_RC=n" >> $SPELL_CONFIG
- fi
+if query "Install the Source Mage /etc/screenrc ?" n
+then
+ persistent_add SCREEN_RC
+ SCREEN_RC=yes
fi

diff --git a/shell-term-fm/screen/HISTORY b/shell-term-fm/screen/HISTORY
index 3aee756..80897d3 100644
--- a/shell-term-fm/screen/HISTORY
+++ b/shell-term-fm/screen/HISTORY
@@ -1,3 +1,7 @@
+2006-11-11 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * CONFIGURE: remove the bitrot and do the right thing
+ * INSTALL: accompanying changes, fixes rest of #11635
+
2006-10-30 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: update to 4.0.3 + SECURITY_PATCH=1,
http://secunia.com/advisories/22583/
diff --git a/shell-term-fm/screen/INSTALL b/shell-term-fm/screen/INSTALL
index a0255f0..2cafe3d 100755
--- a/shell-term-fm/screen/INSTALL
+++ b/shell-term-fm/screen/INSTALL
@@ -1,10 +1,5 @@
default_install &&
-if [ -f /etc/screenrc ]; then
- if [ "$REPLACE_RC" == "y" ]; then
- cp ${SCRIPT_DIRECTORY}/screenrc /etc/screenrc
- else
- cp ${SCRIPT_DIRECTORY}/screenrc /etc/screenrc.new
- fi
-else
- cp ${SCRIPT_DIRECTORY}/screenrc /etc/screenrc
+if [[ $SCREEN_RC == yes ]]; then
+ install_config_file $SCRIPT_DIRECTORY/screenrc /etc/screenrc &&
+ persistent_remove SCREEN_RC
fi
diff --git a/video-libs/gst-plugins-base/DEPENDS
b/video-libs/gst-plugins-base/DEPENDS
index 447a720..1110917 100755
--- a/video-libs/gst-plugins-base/DEPENDS
+++ b/video-libs/gst-plugins-base/DEPENDS
@@ -40,4 +40,8 @@ optional_depends libtheora
optional_depends gtk-doc \
"--enable-gtk-doc" \
"--disable-gtk-doc" \
- "to build documentation"
+ "to build documentation" &&
+
+if is_depends_enabled $SPELL gtk-doc; then
+ depends pyxml
+fi
diff --git a/video-libs/gst-plugins-base/HISTORY
b/video-libs/gst-plugins-base/HISTORY
index 9938cde..42d018a 100644
--- a/video-libs/gst-plugins-base/HISTORY
+++ b/video-libs/gst-plugins-base/HISTORY
@@ -1,3 +1,6 @@
+2006-11-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: depends on pyxml if gtk-doc is enabled, bug #10918
+
2006-09-18 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: updated to 0.10.10

diff --git a/video-libs/gst-plugins-good/DEPENDS
b/video-libs/gst-plugins-good/DEPENDS
index 63655c0..151d1a9 100755
--- a/video-libs/gst-plugins-good/DEPENDS
+++ b/video-libs/gst-plugins-good/DEPENDS
@@ -77,4 +77,8 @@ optional_depends taglib
optional_depends gtk-doc \
"--enable-gtk-doc" \
"--disable-gtk-doc" \
- "to build documentation"
+ "to build documentation" &&
+
+if is_depends_enabled $SPELL gtk-doc; then
+ depends pyxml
+fi
diff --git a/video-libs/gst-plugins-good/HISTORY
b/video-libs/gst-plugins-good/HISTORY
index 0498c16..a20ff91 100644
--- a/video-libs/gst-plugins-good/HISTORY
+++ b/video-libs/gst-plugins-good/HISTORY
@@ -1,3 +1,6 @@
+2006-11-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: depends on pyxml when building docs, similar to bug #10918
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/video-libs/gstreamer/DEPENDS b/video-libs/gstreamer/DEPENDS
index a7355e7..8e4c5bc 100755
--- a/video-libs/gstreamer/DEPENDS
+++ b/video-libs/gstreamer/DEPENDS
@@ -17,4 +17,8 @@ optional_depends gettext
optional_depends gtk-doc \
"--enable-gtk-doc" \
"--disable-gtk-doc" \
- "to build documentation"
+ "to build documentation" &&
+
+if is_depends_enabled $SPELL gtk-doc; then
+ depends pyxml
+fi
diff --git a/video-libs/gstreamer/HISTORY b/video-libs/gstreamer/HISTORY
index 2e09dad..18f1ad5 100644
--- a/video-libs/gstreamer/HISTORY
+++ b/video-libs/gstreamer/HISTORY
@@ -1,3 +1,6 @@
+2006-11-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: depends on pyxml if gtk-doc is enabled, bug #10909
+
2006-09-18 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: updated to 0.10.10

diff --git a/x11-toolkits/wxgtk-no-unicode/DETAILS
b/x11-toolkits/wxgtk-no-unicode/DETAILS
index eacdbf1..d8e847f 100755
--- a/x11-toolkits/wxgtk-no-unicode/DETAILS
+++ b/x11-toolkits/wxgtk-no-unicode/DETAILS
@@ -1,9 +1,9 @@
SPELL=wxgtk-no-unicode
- SPELLX=wxWidgets
- VERSION=2.7.0-1
-
SOURCE_HASH=sha512:58fbf97de19468185cc99c9a5d1783df43fb5bb219b81dcae3b88a6210505a3fb06f809843ee9341b8e33567231caff72b968c24d5736eedfc2f9671df4be588
- SOURCE=$SPELLX-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-${VERSION//-rc1}
+ SPELLX=wxAll
+ VERSION=2.4.2
+
SOURCE_HASH=sha512:19cc25c933411fb71369e35584f6b7daa454b79d6d91a38f81501cd5a318fffd423f010d9ec3db856222badee6b58c0d3b6d023326b2d19a48c1b4b846774894
+ SOURCE=$SPELLX-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/wxWindows-${VERSION}
SOURCE_URL[0]=$SOURCEFORGE_URL/wxwindows/$SOURCE
LICENSE[0]=http://www.wxwidgets.org/licence3.txt
WEB_SITE=http://www.wxwidgets.org/
diff --git a/x11-toolkits/wxgtk-no-unicode/HISTORY
b/x11-toolkits/wxgtk-no-unicode/HISTORY
index 3fb7ea4..4c6d63d 100644
--- a/x11-toolkits/wxgtk-no-unicode/HISTORY
+++ b/x11-toolkits/wxgtk-no-unicode/HISTORY
@@ -1,3 +1,11 @@
+2006-10-29 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Downgraded to version 2.4.2. Please don't update
+ this spell. It is for compatibility.
+ * PRE_BUILD: Added to apply gcc 4.0 patches from:
+ https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=154958
+ * wxGTK-2.4.2-gcc4.patch: gcc 4.0 patch added
+ * wxGTK-2.4.2-gcc4_v2.patch: gcc 4.0 patch added
+
2006-08-28 Anton Brondz <dinolinux AT sourcemage.org>
* DETAILS: updated to 2.7.0-1

diff --git a/x11-toolkits/wxgtk-no-unicode/PRE_BUILD
b/x11-toolkits/wxgtk-no-unicode/PRE_BUILD
new file mode 100755
index 0000000..58669a9
--- /dev/null
+++ b/x11-toolkits/wxgtk-no-unicode/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/wxGTK-2.4.2-gcc4.patch &&
+patch -p0 < $SCRIPT_DIRECTORY/wxGTK-2.4.2-gcc4_v2.patch
+
diff --git a/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-gcc4.patch
b/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-gcc4.patch
new file mode 100644
index 0000000..34cad56
--- /dev/null
+++ b/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-gcc4.patch
@@ -0,0 +1,224 @@
+--- contrib/src/xrc/xml.cpp.gcc4 2003-09-21 07:32:56.000000000 -0400
++++ contrib/src/xrc/xml.cpp 2005-04-15 06:59:47.000000000 -0400
+@@ -354,8 +354,8 @@
+ #else
+ if ( conv )
+ {
+- size_t nLen = (len != wxSTRING_MAXLEN) ? len :
+- nLen = wxConvUTF8.MB2WC((wchar_t*) NULL, s, 0);
++ size_t nLen = ((len != wxSTRING_MAXLEN) ? len :
++ wxConvUTF8.MB2WC((wchar_t*) NULL, s, 0));
+
+ wchar_t *buf = new wchar_t[nLen+1];
+ wxConvUTF8.MB2WC(buf, s, nLen);
+--- contrib/src/xrc/expat/xmlparse/xmlparse.c.gcc4 2003-09-21
07:32:54.000000000 -0400
++++ contrib/src/xrc/expat/xmlparse/xmlparse.c 2005-04-15 06:59:47.000000000
-0400
+@@ -203,8 +203,10 @@
+ static enum XML_Error
+ doProlog(XML_Parser parser, const ENCODING *enc, const char *s,
+ const char *end, int tok, const char *next, const char **nextPtr);
++#ifdef XML_DTD
+ static enum XML_Error
+ processInternalParamEntity(XML_Parser parser, ENTITY *entity);
++#endif /* XML_DTD */
+ static enum XML_Error
+ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
+ const char *start, const char *end, const char **endPtr);
+--- contrib/src/stc/scintilla/src/Document.cxx.gcc4 2003-09-21
07:32:47.000000000 -0400
++++ contrib/src/stc/scintilla/src/Document.cxx 2005-04-15 06:59:47.000000000
-0400
+@@ -850,6 +850,7 @@
+ DocumentIndexer(Document *pdoc_, int end_) :
+ pdoc(pdoc_), end(end_) {
+ }
++ virtual ~DocumentIndexer() {};
+
+ virtual char CharAt(int index) {
+ if (index < 0 || index >= end)
+--- contrib/src/stc/scintilla/src/ExternalLexer.h.gcc4 2003-09-21
07:32:50.000000000 -0400
++++ contrib/src/stc/scintilla/src/ExternalLexer.h 2005-04-15
06:59:47.000000000 -0400
+@@ -38,6 +38,7 @@
+ strncpy(name, languageName_, sizeof(name));
+ languageName = name;
+ };
++ virtual ~ExternalLexerModule() {};
+ virtual void Lex(unsigned int startPos, int lengthDoc, int initStyle,
+ WordList *keywordlists[], Accessor
&styler) const;
+ virtual void Fold(unsigned int startPos, int lengthDoc, int initStyle,
+--- contrib/src/stc/scintilla/src/RESearch.h.gcc4 2003-09-21
07:32:50.000000000 -0400
++++ contrib/src/stc/scintilla/src/RESearch.h 2005-04-15 06:59:47.000000000
-0400
+@@ -20,6 +20,7 @@
+ class CharacterIndexer {
+ public:
+ virtual char CharAt(int index)=0;
++ virtual ~CharacterIndexer() {};
+ };
+
+ class RESearch {
+--- contrib/src/stc/scintilla/include/KeyWords.h.gcc4 2003-09-21
07:32:47.000000000 -0400
++++ contrib/src/stc/scintilla/include/KeyWords.h 2005-04-15
06:59:47.000000000 -0400
+@@ -29,6 +29,7 @@
+ LexerModule(int language_, LexerFunction fnLexer_,
+ const char *languageName_=0, LexerFunction fnFolder_=0,
+ const char * const wordListDescriptions_[] = NULL);
++ virtual ~LexerModule() {};
+ int GetLanguage() const { return language; }
+
+ // -1 is returned if no WordList information is available
+--- src/common/dircmn.cpp.gcc4 2003-09-21 07:31:39.000000000 -0400
++++ src/common/dircmn.cpp 2005-04-15 06:59:47.000000000 -0400
+@@ -147,6 +147,7 @@
+ {
+ public:
+ wxDirTraverserSimple(wxArrayString& files) : m_files(files) { }
++ virtual ~wxDirTraverserSimple() {};
+
+ virtual wxDirTraverseResult OnFile(const wxString& filename)
+ {
+--- src/common/xpmdecod.cpp.gcc4 2003-09-21 07:31:39.000000000 -0400
++++ src/common/xpmdecod.cpp 2005-04-15 14:06:53.000000000 -0400
+@@ -669,7 +669,7 @@
+ wxChar key[64];
+ const char *clr_def;
+ bool hasMask;
+- wxXPMColourMapData clr_data;
++ wxXPMColourMapData clr_data = {0, 0, 0};
+ wxXPMColourMap clr_tbl;
+
+ /*
+@@ -712,7 +712,7 @@
+ }
+ else
+ {
+- bool isNone;
++ bool isNone = false;
+ if ( !GetRGBFromName(clr_def, &isNone,
+ &clr_data.R, &clr_data.G, &clr_data.B) )
+ {
+--- src/unix/mimetype.cpp.gcc4 2003-09-21 07:31:40.000000000 -0400
++++ src/unix/mimetype.cpp 2005-04-15 06:59:47.000000000 -0400
+@@ -1580,7 +1580,7 @@
+ {
+ // now got a file we can write to ....
+ wxMimeTypeCommands * entries = m_aEntries[index];
+- size_t iOpen;
++ size_t iOpen = 0;
+ wxString sCmd = entries->GetCommandForVerb(_T("open"), &iOpen);
+ wxString sTmp;
+
+--- include/wx/statline.h.gcc4 2003-09-21 07:31:35.000000000 -0400
++++ include/wx/statline.h 2005-04-15 06:59:47.000000000 -0400
+@@ -39,6 +39,7 @@
+ public:
+ // constructor
+ wxStaticLineBase() { }
++ virtual ~wxStaticLineBase() {};
+
+ // is the line vertical?
+ bool IsVertical() const { return (GetWindowStyle() & wxLI_VERTICAL) !=
0; }
+--- include/wx/datetime.h.gcc4 2003-09-21 07:31:30.000000000 -0400
++++ include/wx/datetime.h 2005-04-15 06:59:47.000000000 -0400
+@@ -1300,6 +1300,7 @@
+ {
+ friend class wxDateTimeHolidaysModule;
+ public:
++ virtual ~wxDateTimeHolidayAuthority() {};
+ // returns TRUE if the given date is a holiday
+ static bool IsHoliday(const wxDateTime& dt);
+
+@@ -1340,6 +1341,8 @@
+ // the holidays for this class are all Saturdays and Sundays
+ class WXDLLEXPORT wxDateTimeWorkDays : public wxDateTimeHolidayAuthority
+ {
++public:
++ virtual ~wxDateTimeWorkDays() {};
+ protected:
+ virtual bool DoIsHoliday(const wxDateTime& dt) const;
+ virtual size_t DoGetHolidaysInRange(const wxDateTime& dtStart,
+--- include/wx/notebook.h.gcc4 2003-09-21 07:31:34.000000000 -0400
++++ include/wx/notebook.h 2005-04-15 06:59:47.000000000 -0400
+@@ -193,6 +193,7 @@
+ m_nSel = nSel;
+ m_nOldSel = nOldSel;
+ }
++ virtual ~wxNotebookEvent() {};
+
+ // accessors
+ // the currently selected page (-1 if none)
+--- include/wx/event.h.gcc4 2003-09-21 07:31:33.000000000 -0400
++++ include/wx/event.h 2005-04-15 06:59:47.000000000 -0400
+@@ -1952,6 +1952,7 @@
+ : wxEventTableEntryBase(id, idLast, fn, data),
+ m_eventType(evType)
+ { }
++ virtual ~wxEventTableEntry() {};
+
+ // the reference to event type: this allows us to not care about the
+ // (undefined) order in which the event table entries and the event
types
+--- include/wx/geometry.h.gcc4 2003-09-21 07:31:34.000000000 -0400
++++ include/wx/geometry.h 2005-04-15 06:59:47.000000000 -0400
+@@ -785,6 +785,7 @@
+ class wxTransform2D
+ {
+ public :
++ virtual ~wxTransform2D() {};
+ virtual void Transform( wxPoint2DInt* pt )const = 0;
+ virtual void Transform( wxRect2DInt* r ) const;
+ virtual wxPoint2DInt Transform( const wxPoint2DInt &pt ) const;
+--- include/wx/list.h.gcc4 2003-09-21 07:31:34.000000000 -0400
++++ include/wx/list.h 2005-04-15 14:05:22.000000000 -0400
+@@ -384,6 +384,7 @@
+ T *data = (T *)NULL,
\
+ const wxListKey& key = wxDefaultListKey)
\
+ : wxNodeBase(list, previous, next, data, key) { }
\
++ virtual ~nodetype() {};
\
+
\
+ nodetype *GetNext() const
\
+ { return (nodetype *)wxNodeBase::GetNext(); }
\
+@@ -410,6 +411,7 @@
+
\
+ name& operator=(const name& list)
\
+ { (void) wxListBase::operator=(list); return *this; }
\
++ virtual ~name() {};
\
+
\
+ nodetype *GetFirst() const
\
+ { return (nodetype *)wxListBase::GetFirst(); }
\
+--- include/wx/radiobox.h.gcc4 2003-09-21 07:31:35.000000000 -0400
++++ include/wx/radiobox.h 2005-04-15 06:59:47.000000000 -0400
+@@ -35,6 +35,7 @@
+ class WXDLLEXPORT wxRadioBoxBase
+ {
+ public:
++ virtual ~wxRadioBoxBase() {};
+ // selection
+ virtual void SetSelection(int n) = 0;
+ virtual int GetSelection() const = 0;
+--- include/wx/caret.h.gcc4 2003-09-21 07:31:30.000000000 -0400
++++ include/wx/caret.h 2005-04-15 06:59:47.000000000 -0400
+@@ -60,6 +60,7 @@
+
+ (void)Create(window, size);
+ }
++ virtual ~wxCaretBase() {};
+
+ // Create() functions - same as ctor but returns the success code
+ // --------------------------------------------------------------
+--- include/wx/dir.h.gcc4 2003-09-21 07:31:32.000000000 -0400
++++ include/wx/dir.h 2005-04-15 06:59:47.000000000 -0400
+@@ -52,6 +52,7 @@
+ class WXDLLEXPORT wxDirTraverser
+ {
+ public:
++ virtual ~wxDirTraverser() {};
+ // called for each file found by wxDir::Traverse()
+ //
+ // return wxDIR_STOP or wxDIR_CONTINUE from here
+--- include/wx/clipbrd.h.gcc4 2003-09-21 07:31:30.000000000 -0400
++++ include/wx/clipbrd.h 2005-04-15 06:59:47.000000000 -0400
+@@ -39,6 +39,7 @@
+ {
+ public:
+ wxClipboardBase();
++ virtual ~wxClipboardBase() {};
+
+ // open the clipboard before Add/SetData() and GetData()
+ virtual bool Open() = 0;
diff --git a/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-gcc4_v2.patch
b/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-gcc4_v2.patch
new file mode 100644
index 0000000..0dfe7a7
--- /dev/null
+++ b/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-gcc4_v2.patch
@@ -0,0 +1,11 @@
+--- src/common/sckfile.cpp.orig 2005-04-16 16:50:11.000000000 -0700
++++ src/common/sckfile.cpp 2005-04-16 16:50:14.000000000 -0700
+@@ -9,7 +9,7 @@
+ // Licence: wxWindows license
+
/////////////////////////////////////////////////////////////////////////////
+ #ifdef __GNUG__
+-#pragma implementation "sckfile.h"
++#pragma implementation "file.h"
+ #endif
+
+ // For compilers that support precompilation, includes "wx.h".
diff --git a/x11/pypanel/DEPENDS b/x11/pypanel/DEPENDS
index 9ff98e2..c038762 100755
--- a/x11/pypanel/DEPENDS
+++ b/x11/pypanel/DEPENDS
@@ -1 +1,9 @@
-depends python-xlib
+. $GRIMOIRE/FUNCTIONS &&
+depends python-xlib &&
+depends imlib2 &&
+
+if check_if_xorg_modular_libs gtk+; then
+ optional_depends libxft "" "" "for font type and colors support"
+else
+ optional_depends X11-LIBS "" "" "for font type and colors support"
+fi
diff --git a/x11/pypanel/DETAILS b/x11/pypanel/DETAILS
index ef5238b..df9a1ae 100755
--- a/x11/pypanel/DETAILS
+++ b/x11/pypanel/DETAILS
@@ -1,9 +1,9 @@
SPELL=pypanel
- VERSION=2.2
+ VERSION=2.4
SOURCE=PyPanel-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/PyPanel-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/pypanel/$SOURCE
-
SOURCE_HASH=sha512:954c845d8c1dad7e181f58c8ade2176f85d246a4184ee29bd3dee6681c4c389198a5383ca7f6258630f0d76d80d7d151e11f014010ee637fafd3342295b264e9
+
SOURCE_HASH=sha512:acda16cbf4f725ee3f0e97e11f04177fc819f6c09d0bcc864c9de1fc0c1bc0bfe2593233e5b8b85399ad41bc07763ad87d7045bac4dece9dc15d6eaf3136895e
WEB_SITE=http://pypanel.sourceforge.net/
LICENSE[0]=GPL
ENTERED=20040709
diff --git a/x11/pypanel/HISTORY b/x11/pypanel/HISTORY
index 87d8f2a..96fbe61 100644
--- a/x11/pypanel/HISTORY
+++ b/x11/pypanel/HISTORY
@@ -1,3 +1,9 @@
+2006-11-08 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: added imlib2 and optional libxft/X11-LIBS
+
+2006-11-08 Stephan Erb <steve-e AT h3c.de>
+ * DETAILS: Updated to 2.4 #10811
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.




  • [SM-Commit] GIT changes to stable-rc-0.6 grimoire by Eric Sandall (b992897e77fbe5e49b5b490ad0484b5eb5a5b0e8), Eric Sandall, 11/23/2006

Archive powered by MHonArc 2.6.24.

Top of Page