New commits:
commit 6defa10fd1b8d88c69cb626ba24ecbe6ce6fa092
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>
readline: Forgot to add the CONFIGURE yesterday.
Conflicts:
libs/readline/DETAILS
libs/readline/HISTORY
commit 58014b996ab69b91e26202b8d9b8b4f1f9778642
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>
readline: Made inputrc install optional, bug #10021.
Conflicts:
libs/readline/HISTORY
libs/readline/INSTALL
commit 792c8d38912f3aa75d7a6e80f345833d472f7f73
Author: George Sherwood <chat AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>
apache2: Added config.layout from apache22. Bug #13051.
Conflicts:
http/apache2/HISTORY
commit be18648f255460b6cef1867c5e69c9615004e405
Author: Kevin Dahan <unet AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>
commit 3558743a1a4e11a2b71b5afeccdc6f27cb7aa80a
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.
commit 75f9b68cf30a0f0ef8d1279238e3ccd059dfd946
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
Conflicts:
libs/mpfr/DETAILS
libs/mpfr/HISTORY
diff --git a/ChangeLog b/ChangeLog
index 9c64b47..dddda55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
+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-im/eb-lite: removed. Not developed. Won't build.
+ * chat-im/gnomemeeting: removed, been deprecated for 10 months
+ * chat-im/openh323: removed, doesn't build. Not used any more.
+
+2006-10-21 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * accounts, groups: added iplog and backup
+
+2006-10-19 Juuso Alasuutari <iuso AT sourcemage.org>
+ * is_depends_enabled.function: Added temporarily, to be removed
+ once is_depends_enabled is in stable sorcery.
2006-10-11 David Kowis <dkowis AT shlrm.org>
* doc/guru_handbook: the spell is no longer compatible with the
current
diff --git a/accounts b/accounts
index fb5df8a..092f582 100755
--- a/accounts
+++ b/accounts
@@ -4,6 +4,7 @@ daemon:1:1
mail:8:8 news:9:9
www-data:33:33
+backup:34:34
firebird:84:84
bind:101:101
gnats:102:102
diff --git a/audio-creation/hydrogen/BUILD b/audio-creation/hydrogen/BUILD
index 5685cca..18edf61 100755
--- a/audio-creation/hydrogen/BUILD
+++ b/audio-creation/hydrogen/BUILD
@@ -1,2 +1,5 @@
-sed -i "/update-menus/D" Makefile.in &&
+OPTS="$HYDROGEN_OSS $OPTS" &&
+if [[ -f /etc/profile.d/qt.sh ]]; then
+ . /etc/profile.d/qt.sh
+fi &&
default_build
diff --git a/audio-creation/hydrogen/DEPENDS b/audio-creation/hydrogen/DEPENDS
index 7cc03c8..26c543c 100755
--- a/audio-creation/hydrogen/DEPENDS
+++ b/audio-creation/hydrogen/DEPENDS
@@ -1,6 +1,7 @@
depends qt-x11 &&
depends audiofile &&
depends flac &&
+depends libsndfile &&
optional_depends JACK-DRIVER \
"" \
diff --git a/audio-creation/hydrogen/DETAILS b/audio-creation/hydrogen/DETAILS
index c3f2b98..ac7cb6a 100755
--- a/audio-creation/hydrogen/DETAILS
+++ b/audio-creation/hydrogen/DETAILS
@@ -1,14 +1,15 @@
SPELL=hydrogen
- VERSION=0.9.2
+ VERSION=0.9.3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.hydrogen-music.org/download/sources/$SOURCE
-
SOURCE_HASH=sha512:4e4139f6f442c62d78f88d044404b176d46725d22cdf181dd8cd948bf183d35968dbe5a3370f44e44b9756aa917e3f727cc7c6f1991496df5be62988c365c7c4
+
SOURCE_HASH=sha512:d25becb06758fe40c256049315f61b4e5173fdfeb9ba87814cbccb1520b6111bf94bc745a8d730fdc9fd0d155f4ad88784d6906b0d2b87b74829edb878852c44
WEB_SITE=http://hydrogen.sf.net
ENTERED=20031217
UPDATED=20031217
LICENSE[0]=GPL
BUILD_API=2
+ KEYWORDS="editors audio"
SHORT="Advanced drum machine for GNU/Linux."
cat << EOF
Hydrogen is an advanced drum machine for GNU/Linux. It's main goal is to
diff --git a/audio-creation/hydrogen/HISTORY b/audio-creation/hydrogen/HISTORY
index de9f1ae..3f39503 100644
--- a/audio-creation/hydrogen/HISTORY
+++ b/audio-creation/hydrogen/HISTORY
@@ -1,3 +1,13 @@
+2006-11-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * BUILD: added sourcing of profile script for qt, a stab at fixing
#11821
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
+2006-03-02 anoxia <anoxia AT sourcemage.org>
+ * DETAILS: updated to 0.9.3
+ * DEPENDS: added libsndfile
+
2005-11-29 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 -> SHA512
optional_depends fluidsynth \
- "" \
+ "--enable-fluidsynth" \
"--disable-fluidsynth" \
- "for sf2 support"
+ "for FluidSynth softsynth plugin" &&
+optional_depends lash \
+ "--enable-lash" \
+ "--disable-lash" \
+ "for Linux Audio Session Handler support"
+
+# Notice: MusE can depend on FST for VST plugin hosting, but the
+# supported FST version is an obsolete 1.6 which won't compile with
+# recent Wine versions. Hopefully VST hosting will again work in MusE
+# 1.0 which should be out soon.
diff --git a/audio-creation/muse/DETAILS b/audio-creation/muse/DETAILS
index e35b4ee..15f9b3f 100755
--- a/audio-creation/muse/DETAILS
+++ b/audio-creation/muse/DETAILS
@@ -1,17 +1,32 @@
SPELL=muse
- VERSION=0.7.1
- SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ VERSION=0.8.1a
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION%a}
SOURCE_URL[0]=$SOURCEFORGE_URL/lmuse/$SOURCE
-
SOURCE_HASH=sha512:516201a21166dad3f47281e9ae6d5f8c423bfb72a74e45d07c80dd1b9e2a9d6ea24d164e70d4d90d083ea65e4bc17236e192e562838749ca7013b287554bd9aa
- WEB_SITE=http://lmuse.sf.net/
+
SOURCE_HASH=sha512:6258af73d3ab8d8fed63fe32b947616242d660fa20abc76243996931958f038e681f71fb79c25539c738d28652f21362c6c5fb7634b8755cf52954ac9a0b2a9b
+ WEB_SITE=http://www.muse-sequencer.org
ENTERED=20031209
- UPDATED=20031209
LICENSE[0]=GPL
- BUILD_API=2
- SHORT="Multitrack virtual studio for Linux"
+ KEYWORDS="editors audio"
+ SHORT="A MIDI/Audio sequencer with recording and editing
capabilities."
cat << EOF
-MusE is a multitrack virtual studio for Linux that has support for
-sequencing of both midi and audio and has, among other things,
-support for LADSPA, Jack and ALSA
+MusE is a MIDI/Audio sequencer with recording and editing capabilities
written
+by Werner Schweer. MusE aims to be a complete multitrack virtual studio for
+Linux, it is published under the GNU General Public License. MusE has among
+other things support for:
+
+* Midi sequencing
+ * Record/Playback/Import
+ * Input filter
+* Audio sequencing
+ * Record/Playback several mono/stereo inputs/outputs.
+ * Use effects
+ * Nice routing features
+ * AudioGroups
+* LADSPA
+ * Perform audio effects like chorus/flanger!
+* Jack
+ * Use the Jack Audio Connection Kit for midi/audio routing.
+ * Internal Audio Routing Interface
+* ALSA - based on the Advanced Linux Sound Architecture
EOF
diff --git a/audio-creation/muse/HISTORY b/audio-creation/muse/HISTORY
index 8977e7a..3a36e71 100644
--- a/audio-creation/muse/HISTORY
+++ b/audio-creation/muse/HISTORY
@@ -1,3 +1,12 @@
+2006-08-31 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Updated to 0.8.1a, updated WEB_SITE & descriptions,
+ removed UPDATED & BUILD_API.
+ * DEPENDS: Added depends alsa-lib, added comment about missing
+ fst depends (read it if you're wondering about VST support).
+ * BUILD: Edited to use default_build.
+ * configure_fix.diff: Added.
+ * muse_debian_0.8.1-2.diff: Added.
+
2005-11-29 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 -> SHA512
diff --git a/audio-creation/muse/configure_fix.diff
b/audio-creation/muse/configure_fix.diff
new file mode 100644
index 0000000..9fba002
--- /dev/null
+++ b/audio-creation/muse/configure_fix.diff
@@ -0,0 +1,64 @@
+--- configure~ 2006-08-31 01:19:49.000000000 +0300
++++ configure 2006-08-31 01:20:03.000000000 +0300
+@@ -22373,14 +22373,12 @@
+ muse_enable_fluidlib="yes"
+ synth_fluidsynth="fluidsynth"
+ synth_fluid="fluid"
+-synth_fluidsynth_build="yes"
+ # Check whether --enable-fluidsynth or --disable-fluidsynth was given.
+ if test "${enable_fluidsynth+set}" = set; then
+ enableval="$enable_fluidsynth"
+
+ case "$enableval" in
+ "yes")
+- synth_fluidsynth_build="yes"
+ synth_fluidsynth="fluidsynth"
+ synth_fluid="fluid"
+ ;;
+@@ -22388,7 +22386,6 @@
+ muse_enable_fluidlib="no"
+ synth_fluidsynth=""
+ synth_fluid=""
+- synth_fluidsynth_build="no"
+
+ ;;
+ *)
+@@ -22410,7 +22407,6 @@
+ fi
+
+
+-if test "$muse_enable_fluidlib" = "yes"; then
+
+
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+@@ -22575,8 +22571,11 @@
+ _ACEOF
+
+ fi
+-fi
+
++if test "$muse_enable_fluidlib" = "no"; then
++ synth_fluidsynth=""
++ synth_fluid=""
++fi
+
+
+
+@@ -24985,7 +24984,7 @@
+
+ Software synths
+ ---------------
+- FluidSynth: $synth_fluidsynth_build
++ FluidSynth: $muse_enable_fluidlib
+
+ " >&5
+ echo "$as_me:
+@@ -25014,7 +25013,7 @@
+
+ Software synths
+ ---------------
+- FluidSynth: $synth_fluidsynth_build
++ FluidSynth: $muse_enable_fluidlib
+
+ " >&6;}
+
diff --git a/audio-creation/muse/muse_debian_0.8.1a-2.diff
b/audio-creation/muse/muse_debian_0.8.1a-2.diff
new file mode 100644
index 0000000..99503ab
--- /dev/null
+++ b/audio-creation/muse/muse_debian_0.8.1a-2.diff
@@ -0,0 +1,62 @@
+--- a/synti/simpledrums/ssplugin.h 2004-12-13 22:41:01.000000000 +0200
++++ b/synti/simpledrums/ssplugin.h 2006-08-31 00:33:31.000000000 +0300
+@@ -15,6 +15,7 @@
+
+ //#include <ladspa.h>
+ #include "muse/ladspa.h"
++#include "muse/fastlog.h"
+ #include <math.h>
+
+ //---------------------------------------------------------
+@@ -133,27 +134,6 @@
+
+ };
+
+-
+-static inline float fast_log2 (float val)
+- {
+- /* don't use reinterpret_cast<> because that prevents this
+- from being used by pure C code (for example, GnomeCanvasItems)
+- */
+- int* const exp_ptr = (int *)(&val);
+- int x = *exp_ptr;
+- const int log_2 = ((x >> 23) & 255) - 128;
+- x &= ~(255 << 23);
+- x += 127 << 23;
+- *exp_ptr = x;
+- val = ((-1.0f/3) * val + 2) * val - 2.0f/3; // (1)
+- return (val + log_2);
+- }
+-
+-static inline float fast_log10 (const float val)
+- {
+- return fast_log2(val) / 3.312500f;
+- }
+-
+ //---------------------------------------------------------
+ // PluginList
+ //---------------------------------------------------------
+--- a/synti/vam/vamgui.cpp 2006-01-01 23:11:05.000000000 +0200
++++ b/synti/vam/vamgui.cpp 2006-08-31 00:33:39.000000000 +0300
+@@ -558,7 +558,7 @@
+ "Select a preset");
+ if (fn.isEmpty())
+ return;
+- bool popenFlag;
++ //bool popenFlag;
+ FILE* f = fopen(fn.ascii(),"r");//fileOpen(this, fn, QString(".pre"),
"r", popenFlag, true);
+ if (f == 0)
+ return;
+@@ -605,9 +605,9 @@
+ }
+ }
+ ende:
+- if (popenFlag)
+- pclose(f);
+- else
++ //if (popenFlag)
++ // pclose(f);
++ //else
+ fclose(f);
+
+ if (presetFileName) delete presetFileName;
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 4e20fa3..b84c039 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
UPDATED=20041022
LICENSE[0]=GPL
diff --git a/audio-drivers/dream/HISTORY b/audio-drivers/dream/HISTORY
index f2f5c80..48f80c9 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
+
2005-11-29 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 -> SHA512
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/nas/BUILD b/audio-drivers/nas/BUILD
index f347ea3..4d7a3b8 100755
--- a/audio-drivers/nas/BUILD
+++ b/audio-drivers/nas/BUILD
@@ -1,2 +1,5 @@
-xmkmf &&
+if [[ "$(get_spell_provider $SPELL X11-SERVER)" != "xorg-server" ]]; then
+ xmkmf
+fi &&
+
make World
diff --git a/audio-drivers/nas/DETAILS b/audio-drivers/nas/DETAILS
index 25f4fac..8098170 100755
--- a/audio-drivers/nas/DETAILS
+++ b/audio-drivers/nas/DETAILS
@@ -1,9 +1,9 @@
SPELL=nas
- VERSION=1.7b
+ VERSION=1.8
SOURCE=$SPELL-$VERSION.src.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://nas.codebrilliance.com/nas/$SOURCE
-
SOURCE_HASH=sha512:cbddb29355b4ce5380751e88a7260d1f2bee37ed25b8a0cd83ff4753b387a0fd6f5539269d6fccdee84e2295d5d8327f4969482459b2d4200d4ad60897ac1203
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
WEB_SITE=http://radscan.com/nas.html
ENTERED=20030315
UPDATED=20050403
diff --git a/audio-drivers/nas/HISTORY b/audio-drivers/nas/HISTORY
index e371490..df7a4fa 100644
--- a/audio-drivers/nas/HISTORY
+++ b/audio-drivers/nas/HISTORY
@@ -1,5 +1,15 @@
-2006-10-11 David Kowis <dkowis AT shlrm.org>
- * DEPENDS: fixing bug 10277
+2006-07-08 Robin Cook <rcook AT wyrms.net>
+ * PRE_BUILD: better way of changing paths
+ * BUILD: correct typo
+
+2006-07-07 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 1.8
+ * PRE_BUILD: added to change xorg path if xorg-server
+ * BUILD: only run xmkmf if not xorg-server
+ (not sure where it is getting the paths from.)
+
+2006-06-20 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: added rman
2005-11-29 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 -> SHA512
diff --git a/audio-drivers/nas/PRE_BUILD b/audio-drivers/nas/PRE_BUILD
new file mode 100755
index 0000000..8d1e865
--- /dev/null
+++ b/audio-drivers/nas/PRE_BUILD
@@ -0,0 +1,11 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+if [[ "$(get_spell_provider $SPELL X11-SERVER)" == "xorg-server" ]]; then
+
+ for FILE in $(grep -l -R X11R6 *)
+ do
+ sed -i "s:/X11R6::g" ${FILE}
+ done
+
+fi
diff --git a/audio-drivers/nas/nas-1.8.src.tar.gz.sig
b/audio-drivers/nas/nas-1.8.src.tar.gz.sig
new file mode 100644
index 0000000..ccad8f2
Binary files /dev/null and b/audio-drivers/nas/nas-1.8.src.tar.gz.sig differ
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 5777a91..69cfa4d 100755
--- a/audio-drivers/podxt/DETAILS
+++ b/audio-drivers/podxt/DETAILS
@@ -1,12 +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
- UPDATED=20041201
+ PATCHLEVEL=1
LICENSE=GPL
BUILD_API=2
SHORT="USB Driver for Line6 PODxt"
diff --git a/audio-drivers/podxt/HISTORY b/audio-drivers/podxt/HISTORY
index 19c2a95..4b1a231 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
+
2005-12-07 Flavien Bridault <disk AT sourcemage.org>
* DETAILS: updated to 0.5.2
SOURCE_URL[2]=ftp://the.wiretapped.net/pub/security/network-monitoring/iptraf/$SOURCE
WEB_SITE=http://cebu.mozcom.com/riker/iptraf/
- BUILD_API=2
-
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
IPTraf is a console-based network statistics utility for Linux.
diff --git a/net/iptraf/HISTORY b/net/iptraf/HISTORY
index 7e6f1f5..76a8e7f 100644
--- a/net/iptraf/HISTORY
+++ b/net/iptraf/HISTORY
@@ -1,3 +1,18 @@
+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.
+
+2006-08-18 Matthew Clark <matthewclark AT inlesserterms.net>
+ * DETAILS: Removed dead SOURCE_URL[0] and SOURCE_URL[2]
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
2005-11-29 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 -> SHA512
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 a160e9d..371b366 100755
--- a/net/mtr/DETAILS
+++ b/net/mtr/DETAILS
@@ -6,9 +6,9 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_HASH=sha512:0b88e6b18d2f6136779741a3de9a86debb6fd89ac230a03cddeeb790c633e535292a2d07a73bc9fa5ae9bb9886e3c5f66f67e1babd7f91ef5e0c3f60b9fcebfc
WEB_SITE=http://www.bitwizard.nl/mtr/
ENTERED=20010922
- UPDATED=20041211
- BUILD_API=2
- SHORT="matt's traceroute is a network diagnostic tool"
+ PATCHLEVEL=1
+ KEYWORDS="net"
+ SHORT="mtr combines the functionality of 'traceroute' and 'ping'"
cat << EOF
mtr (matt's traceroute) is a system administrators utility to trace the
route ip packets from the current system take in getting to some
diff --git a/net/mtr/HISTORY b/net/mtr/HISTORY
index b6dc042..abc8441 100644
--- a/net/mtr/HISTORY
+++ b/net/mtr/HISTORY
@@ -1,3 +1,14 @@
+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.
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
2005-11-29 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 -> SHA512
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 54a2c7b..9cdff6c 100644
--- a/shell-term-fm/fish/HISTORY
+++ b/shell-term-fm/fish/HISTORY
@@ -1,2 +1,5 @@
+2006-11-08 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: added bc #10766
+
2005-12-20 Unet <unet AT sourcemage.org>
* ALL: Created spell
diff --git a/shell-term-fm/screen/CONFIGURE b/shell-term-fm/screen/CONFIGURE
index 81100a8..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 ?" y
- 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 cf48336..b33367d 100644
--- a/shell-term-fm/screen/HISTORY
+++ b/shell-term-fm/screen/HISTORY
@@ -1,6 +1,9 @@
-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/
+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-07-23 david Kowis <dkowis AT shlrm.org>
+ * CONFIGURE: made replacement of screenrc default to no