Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (d7b2b6655e1af4c2ace11c685c33a2a4eb46a45f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (d7b2b6655e1af4c2ace11c685c33a2a4eb46a45f)
  • Date: Fri, 11 May 2007 15:43:40 -0500

GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

audio-creation/beast/CONFIGURE | 16
audio-creation/beast/DETAILS | 4
audio-creation/beast/HISTORY | 5
audio-creation/beast/PRE_BUILD | 3
audio-creation/beast/beast-0.7.1.tar.bz2.sig |binary
audio-creation/beast/beast-guile-1.8.diff | 665
++++++++++++++++++++++++
audio-creation/glame/CONFIGURE | 16
audio-creation/glame/DEPENDS | 32 -
audio-creation/glame/DETAILS | 4
audio-creation/glame/HISTORY | 8
audio-creation/glame/PRE_BUILD | 4
audio-creation/glame/glame-2.0.1.tar.gz.sig |binary
audio-creation/snd/CONFIGURE | 17
audio-creation/snd/DEPENDS | 10
audio-creation/snd/DETAILS | 4
audio-creation/snd/HISTORY | 7
audio-creation/snd/PRE_BUILD | 3
audio-creation/snd/snd-8.9.tar.gz.sig |binary
crypto/crank/BUILD | 2
crypto/crank/CONFIGURE | 16
crypto/crank/DEPENDS | 3
crypto/crank/HISTORY | 5
database/guile-dbi/DETAILS | 9
database/guile-dbi/HISTORY | 3
dev/null |binary
devel/g-wrap/BUILD | 5
devel/g-wrap/DETAILS | 10
devel/g-wrap/HISTORY | 8
devel/g-wrap/PREPARE | 1
devel/g-wrap/PRE_SUB_DEPENDS | 5
devel/g-wrap/SUB_DEPENDS | 7
devel/g-wrap/g-wrap.gpg |binary
devel/greg/DETAILS | 9
devel/greg/HISTORY | 3
devel/guile/BUILD | 7
devel/guile/DEPENDS | 9
devel/guile/DETAILS | 10
devel/guile/HISTORY | 7
devel/guile/POST_REMOVE | 1
devel/guile/PREPARE | 1
devel/guile/PRE_BUILD | 7
devel/guile/UP_TRIGGERS | 13
devel/guile/use-syntax.patch | 14
editors/texmacs/DETAILS | 4
editors/texmacs/HISTORY | 3
editors/texmacs/TeXmacs-1.0.6.8-src.tar.gz.sig | 0
editors/texmacs/TeXmacs-1.0.6.9-src.tar.gz.sig |binary
gnome1-apps/gnucash/BUILD | 13
gnome1-apps/gnucash/CONFIGURE | 16
gnome1-apps/gnucash/CONFLICTS | 1
gnome1-apps/gnucash/DEPENDS | 95 ---
gnome1-apps/gnucash/DETAILS | 24
gnome1-apps/gnucash/HISTORY | 3
gnome1-apps/gnucash/INSTALL | 1
gnome1-apps/gnucash/PREPARE | 6
gnome1-apps/gnucash/PRE_BUILD | 7
gnome1-apps/gnucash/TRIGGERS | 1
gnome1-apps/gnucash/gnucash-1.8.12.tar.gz.sig | 0
gnome1-apps/gnumeric/BUILD | 1
gnome1-apps/gnumeric/CONFIGURE | 16
gnome1-apps/gnumeric/DEPENDS | 24
gnome1-apps/gnumeric/DETAILS | 13
gnome1-apps/gnumeric/HISTORY | 3
gnome1-apps/gnumeric/INSTALL | 1
gnome1-apps/gnumeric/PRE_BUILD | 1
gnome1-apps/gnumeric/TRIGGERS | 1
gnome1-libs/gnome-games/BUILD | 13
gnome1-libs/gnome-games/CONFIGURE | 16
gnome1-libs/gnome-games/CONFLICTS | 1
gnome1-libs/gnome-games/DEPENDS | 6
gnome1-libs/gnome-games/DETAILS | 13
gnome1-libs/gnome-games/HISTORY | 3
gnome1-libs/gnome-games/INSTALL | 1
gnome1-libs/gnome-games/PRE_BUILD | 1
gnome1-libs/gnome-games/TRIGGERS | 1
gnome1-libs/gnome-karubik-profile/BUILD | 2
gnome1-libs/gnome-karubik-profile/DEPENDS | 69 --
gnome1-libs/gnome-karubik-profile/DETAILS | 3
gnome1-libs/gnome-karubik-profile/HISTORY | 3
gnome1-libs/gnome-karubik-profile/INSTALL | 1
gnome1-libs/gnome-karubik-profile/POST_BUILD | 1
gnome1-libs/gnome-karubik-profile/TRIGGERS | 1
gnome1-libs/gnome-utils/BUILD | 13
gnome1-libs/gnome-utils/CONFIGURE | 16
gnome1-libs/gnome-utils/CONFLICTS | 1
gnome1-libs/gnome-utils/DEPENDS | 8
gnome1-libs/gnome-utils/DETAILS | 13
gnome1-libs/gnome-utils/HISTORY | 3
gnome1-libs/gnome-utils/INSTALL | 1
gnome1-libs/gnome-utils/PRE_BUILD | 1
gnome1-libs/gnome-utils/TRIGGERS | 1
gnome1-libs/guppi/BUILD | 3
gnome1-libs/guppi/CONFIGURE | 16
gnome1-libs/guppi/DEPENDS | 15
gnome1-libs/guppi/DETAILS | 11
gnome1-libs/guppi/HISTORY | 3
gnome1-libs/guppi/INSTALL | 1
gnome1-libs/guppi/PRE_BUILD | 1
gnome1-libs/guppi/TRIGGERS | 1
gnome1-libs/guppi/gcc341.diff | 76 --
gnome2-apps/gnucash2/CONFIGURE | 16
gnome2-apps/gnucash2/DEPENDS | 4
gnome2-apps/gnucash2/HISTORY | 7
gnome2-apps/gnucash2/PRE_BUILD | 3
gnome2-apps/gnucash2/configure-fix.diff | 40 +
gnome2-apps/gnumeric2/CONFIGURE | 16
gnome2-apps/gnumeric2/DEPENDS | 7
gnome2-apps/gnumeric2/HISTORY | 4
gnome2-libs/gnome-games2/CONFIGURE | 16
gnome2-libs/gnome-games2/CONFLICTS | 5
gnome2-libs/gnome-games2/HISTORY | 6
gnome2-libs/gnome-utils2/CONFLICTS | 2
gnome2-libs/gnome-utils2/HISTORY | 3
gnome2-libs/gnome2-profile/CONFLICTS | 1
gnome2-libs/gnome2-profile/HISTORY | 3
http/elinks/CONFIGURE | 16
http/elinks/HISTORY | 3
http/guile-www/CONFIGURE | 16
http/guile-www/DETAILS | 1
http/guile-www/HISTORY | 4
libs/serveez/BUILD | 1
libs/serveez/CONFIGURE | 16
libs/serveez/DEPENDS | 1
libs/serveez/DETAILS | 10
libs/serveez/HISTORY | 4
libs/serveez/INSTALL | 1
libs/serveez/PRE_BUILD | 1
libs/serveez/TRIGGERS | 1
libs/slib/DETAILS | 8
libs/slib/HISTORY | 7
libs/slib/INSTALL | 2
libs/slib/slib3a1.zip.sig |binary
mail/anubis/CONFIGURE | 16
mail/anubis/DEPENDS | 2
mail/anubis/HISTORY | 4
mail/mailutils/BUILD | 51 -
mail/mailutils/CONFIGURE | 13
mail/mailutils/DEPENDS | 6
mail/mailutils/HISTORY | 5
x11-toolkits/guile-gtk/CONFIGURE | 16
x11-toolkits/guile-gtk/DEPENDS | 10
x11-toolkits/guile-gtk/DETAILS | 4
x11-toolkits/guile-gtk/HISTORY | 5
x11-toolkits/guile-gtk/guile-gtk-2.0.tar.gz.sig |binary
144 files changed, 978 insertions(+), 885 deletions(-)

New commits:
commit d7b2b6655e1af4c2ace11c685c33a2a4eb46a45f
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

texmacs: updated to 1.0.6.9

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

g-wrap: only support devel version so it works with latest guile

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

mailutils: cleanup config_query and depends usage

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

gnome2-profile: conflict change for gnome-karubik-profile deprecation

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

gnome-utils2: conflict change for gnome-utils deprecation

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

gnome-games2: conflict change for gnome-games deprecation

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

serveez: deprecated, old and broken

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

guppi: deprecated, unmaintained and unused

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

gnome-utils: deprecated for gnome-utils2

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

gnome-karubik-profile: deprecated for gnome2-profile

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

gnome-games: deprecated for gnome-games2

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

gnumeric: deprecated for gnumeric2

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

gnucash: deprecated for gnucash2

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

gnucash2: fixed compile and DEPENDS, removed guile version warning

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

slib: downgrade to 3a1, fix install, fixes gnucash

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

guile-dbi: only support guile 1.8

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

crank: removed guile support

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

beast: updated to 0.7.1, made to work with guile 1.8

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

gnumeric2: removed guile dependency

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

snd: updated to 8.9

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

glame: updated to 2.0.1, support guile 1.8

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

anubis: removed guile version warning, dependency fix

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

elinks: removed guile version warning

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

greg: only support current stable version

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

gnome-games2: removed guile version warning

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

guile-www: removed warning about new guile

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

guile-gtk: updated to 2.0

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

guile: only support latest stable version, various cleanups

diff --git a/audio-creation/beast/CONFIGURE b/audio-creation/beast/CONFIGURE
deleted file mode 100755
index 55601be..0000000
--- a/audio-creation/beast/CONFIGURE
+++ /dev/null
@@ -1,16 +0,0 @@
-if [ -f /etc/sorcery/local/depends/guile.p ]
-then
- . /etc/sorcery/local/depends/guile.p
-fi
-
-if [ "$G_18" = "y" ]
-then
- message "\n${MESSAGE_COLOR}" \
- "${SPELL} isn't released for guile 1.8, so it may not works\n\n"
-
- if ! query "Would you like to continue?" n;
- then
- message "${MESSAGE_COLOR}Please recast later!\n"
- return 1
- fi
-fi
diff --git a/audio-creation/beast/DETAILS b/audio-creation/beast/DETAILS
index c067c39..6e9956f 100755
--- a/audio-creation/beast/DETAILS
+++ b/audio-creation/beast/DETAILS
@@ -1,9 +1,9 @@
SPELL=beast
- VERSION=0.7.0
+ VERSION=0.7.1
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://beast.gtk.org/beast-ftp/v0.7/$SOURCE
-
SOURCE_HASH=sha512:ba9920a733beb6b9ff3fe8114781b56cef3ed495ce5c1888a93d13305bc0006489f18a36032ea4291c5bab824c1f3fc526d6eeb4bdc219c8bdac406486c1619f
WEB_SITE=http://beast.gtk.org
ENTERED=20031118
LICENSE[0]=GPL
diff --git a/audio-creation/beast/HISTORY b/audio-creation/beast/HISTORY
index 5c8a1fe..1f06309 100644
--- a/audio-creation/beast/HISTORY
+++ b/audio-creation/beast/HISTORY
@@ -1,3 +1,8 @@
+2007-04-24 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.7.1
+ * CONFIGURE: removed
+ * PRE_BUILD, beast-guile-1.8.diff: patch to work with guile 1.8
+
2006-10-11 Maurizio Boriani <baux AT sourcemage.org>
* CONFIGURE: Add warning about guile major update.

diff --git a/audio-creation/beast/PRE_BUILD b/audio-creation/beast/PRE_BUILD
new file mode 100755
index 0000000..29f899a
--- /dev/null
+++ b/audio-creation/beast/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/beast-guile-1.8.diff
diff --git a/audio-creation/beast/beast-0.7.1.tar.bz2.sig
b/audio-creation/beast/beast-0.7.1.tar.bz2.sig
new file mode 100644
index 0000000..3e18147
Binary files /dev/null and b/audio-creation/beast/beast-0.7.1.tar.bz2.sig
differ
diff --git a/audio-creation/beast/beast-guile-1.8.diff
b/audio-creation/beast/beast-guile-1.8.diff
new file mode 100644
index 0000000..a2b0949
--- /dev/null
+++ b/audio-creation/beast/beast-guile-1.8.diff
@@ -0,0 +1,665 @@
+diff --git a/shell/bsescm.c b/shell/bsescm.c
+index ee66357..3106d99 100644
+--- a/shell/bsescm.c
++++ b/shell/bsescm.c
+@@ -72,7 +72,7 @@ main (int argc,
+ setlocale (LC_ALL, "");
+
+ env_str = g_getenv ("BSESCM_SLEEP4GDB");
+- if (env_str && atoi (env_str) > 0)
++ if (env_str && atoi (env_str) >= 3)
+ {
+ g_message ("going into sleep mode due to debugging request (pid=%u)",
getpid ());
+ g_usleep (2147483647);
+@@ -80,6 +80,13 @@ main (int argc,
+
+ shell_parse_args (&argc, &argv);
+
++ if (env_str && (atoi (env_str) >= 2 ||
++ (atoi (env_str) >= 1 && !bse_scm_enable_register)))
++ {
++ g_message ("going into sleep mode due to debugging request (pid=%u)",
getpid ());
++ g_usleep (2147483647);
++ }
++
+ if (bse_scm_pipe[0] >= 0 && bse_scm_pipe[1] >= 0)
+ {
+ bse_scm_port = sfi_com_port_from_pipe (PRG_NAME, bse_scm_pipe[0],
bse_scm_pipe[1]);
+diff --git a/shell/bsescminterp.c b/shell/bsescminterp.c
+index cad810b..976c597 100644
+--- a/shell/bsescminterp.c
++++ b/shell/bsescminterp.c
+@@ -32,10 +32,10 @@
+ * SCM_NIMP() - is not immediate?
+ *
+ * catching exceptions:
+- * typedef SCM (*scm_catch_body_t) (void *data);
++ * typedef SCM (*scm_t_catch_body) (void *data);
+ * typedef SCM (*scm_catch_handler_t) (void *data,
+ * SCM tag = SCM_BOOL_T; means catch-all
+- * SCM gh_catch(SCM tag, scm_catch_body_t body, void *body_data,
++ * SCM gh_catch(SCM tag, scm_t_catch_body body, void *body_data,
+ * scm_catch_handler_t handler, void *handler_data);
+ */
+
+@@ -43,10 +43,94 @@
+ #define BSE_SCM_NILP(x) ((x) == SCM_UNSPECIFIED)
+
+
++/* allow guile version special casing */
++#define GUILE_CHECK_VERSION(major,minor,micro) \
++ (SCM_MAJOR_VERSION > (major) || \
++ (SCM_MAJOR_VERSION == (major) && SCM_MINOR_VERSION > (minor)) || \
++ (SCM_MAJOR_VERSION == (major) && SCM_MINOR_VERSION == (minor) && \
++ SCM_MICRO_VERSION >= (micro)))
++
++#if GUILE_CHECK_VERSION (1, 8, 0)
++#define BSE_SCM_DEFER_INTS() do ; while (0)
++#define BSE_SCM_ALLOW_INTS() do ; while (0)
++#define IS_SCM_INT(s_scm) SCM_I_INUMP (s_scm) //
scm_is_integer() breaks for non-fractional floats
++#define SFI_NUM_FROM_SCM(s_scm) ((SfiNum) scm_to_int64 (s_scm))
++#define STRING_CHARS_FROM_SCM(s_scm) scm_i_string_chars (s_scm)
++#define STRING_LENGTH_FROM_SCM(s_scm) scm_i_string_length (s_scm)
++#define IS_SCM_STRING(s_scm) scm_is_string (s_scm)
++#define IS_SCM_SYMBOL(s_scm) scm_is_symbol (s_scm)
++#define IS_SCM_BOOL(s_scm) scm_is_bool (s_scm)
++#define IS_SCM_PAIR(s_scm) scm_is_pair (s_scm)
++#else /* 1.6.x */
++#define BSE_SCM_DEFER_INTS() SCM_REDEFER_INTS // guard
around GC-protected code portions; with incremental int-
++#define BSE_SCM_ALLOW_INTS() SCM_REALLOW_INTS //
blocking. guile recovers from unbalanced defer/allow pairs.
++#define IS_SCM_INT(s_scm) SCM_INUMP (s_scm)
++#define SFI_NUM_FROM_SCM(s_scm) ((SfiNum) scm_num2long_long
((s_scm), 1, "num2int64"))
++#define STRING_CHARS_FROM_SCM(s_scm) SCM_ROCHARS (s_scm)
++#define STRING_LENGTH_FROM_SCM(s_scm) SCM_LENGTH (s_scm)
++#define IS_SCM_STRING(s_scm) SCM_STRINGP (s_scm)
++#define IS_SCM_SYMBOL(s_scm) SCM_SYMBOLP (s_scm)
++#define IS_SCM_BOOL(s_scm) SCM_BOOLP (s_scm)
++#define IS_SCM_PAIR(s_scm) SCM_CONSP (s_scm)
++#endif
++#define IS_SCM_BIG(s_scm) SCM_BIGP (s_scm)
++#define IS_SCM_SFI_NUM(s_scm) (IS_SCM_INT (s_scm) || IS_SCM_BIG
(s_scm))
++
+ /* --- prototypes --- */
+ static SCM bse_scm_from_value (const GValue *value);
+ static GValue* bse_value_from_scm (SCM
sval);
+
++/* --- misc utilities --- */
++static inline SfiNum
++num_from_scm (SCM s_num)
++{
++ SfiNum num = 0; /* int64 */
++ if (IS_SCM_SFI_NUM (s_num))
++ num = SFI_NUM_FROM_SCM (s_num);
++ return num;
++}
++
++static inline gchar*
++strdup_from_scm (SCM s_string)
++{
++ if (IS_SCM_STRING (s_string))
++ return g_strndup (STRING_CHARS_FROM_SCM (s_string),
STRING_LENGTH_FROM_SCM (s_string));
++ else if (IS_SCM_SYMBOL (s_string))
++ {
++ SCM s_sym_string = scm_symbol_to_string (s_string);
++ return strdup_from_scm (s_sym_string);
++ }
++ else
++ return NULL;
++}
++
++static inline GValue*
++string_value_from_scm (SCM s_string)
++{
++ if (IS_SCM_STRING (s_string))
++ return sfi_value_lstring (STRING_CHARS_FROM_SCM (s_string),
STRING_LENGTH_FROM_SCM (s_string));
++ else if (IS_SCM_SYMBOL (s_string))
++ {
++ SCM s_sym_string = scm_symbol_to_string (s_string);
++ return sfi_value_lstring (STRING_CHARS_FROM_SCM (s_sym_string),
STRING_LENGTH_FROM_SCM (s_sym_string));
++ }
++ else
++ return sfi_value_string (NULL);
++}
++
++static inline GValue*
++choice_value_from_scm (SCM s_string)
++{
++ if (IS_SCM_STRING (s_string))
++ return sfi_value_lchoice (STRING_CHARS_FROM_SCM (s_string),
STRING_LENGTH_FROM_SCM (s_string));
++ else if (IS_SCM_SYMBOL (s_string))
++ {
++ SCM s_sym_string = scm_symbol_to_string (s_string);
++ return sfi_value_lchoice (STRING_CHARS_FROM_SCM (s_sym_string),
STRING_LENGTH_FROM_SCM (s_sym_string));
++ }
++ else
++ return sfi_value_choice (NULL);
++}
+
+ /* --- SCM GC hooks --- */
+ static gulong tc_glue_gc_cell = 0;
+@@ -61,51 +145,39 @@ typedef struct {
+ static void
+ bse_scm_enter_gc (SCM *scm_gc_list,
+ gpointer data,
+- BseScmFreeFunc free_func,
++ BseScmFreeFunc free_func, // GC callbacks may run in any
thread
+ gsize size_hint)
+ {
+ BseScmGCCell *gc_cell;
+ SCM s_cell = 0;
+-
+ g_return_if_fail (scm_gc_list != NULL);
+ g_return_if_fail (free_func != NULL);
+-
+ // g_printerr ("GCCell allocating %u bytes (%p).\n", size_hint,
free_func);
+-
+ gc_cell = g_new (BseScmGCCell, 1);
+ gc_cell->data = data;
+ gc_cell->free_func = free_func;
+ gc_cell->size_hint = size_hint + sizeof (BseScmGCCell);
+-
+ SCM_NEWSMOB (s_cell, tc_glue_gc_cell, gc_cell);
+ *scm_gc_list = gh_cons (s_cell, *scm_gc_list);
+- scm_done_malloc (gc_cell->size_hint);
+ }
+
+ static SCM
+-bse_scm_mark_gc_cell (SCM scm_gc_cell)
++bse_scm_mark_gc_cell (SCM scm_gc_cell) /* called from any thread */
+ {
+ // BseScmGCCell *gc_cell = (BseScmGCCell*) SCM_CDR (scm_gc_cell);
+-
+ // g_printerr ("GCCell mark %u bytes (%p).\n", gc_cell->size_hint,
gc_cell->free_func);
+-
+ /* scm_gc_mark (gc_cell->something); */
+-
+ return SCM_BOOL_F;
+ }
+
+ static scm_sizet
+-bse_scm_free_gc_cell (SCM scm_gc_cell)
++bse_scm_free_gc_cell (SCM scm_gc_cell) /* called from any thread */
+ {
+ BseScmGCCell *gc_cell = SCM_GET_GLUE_GC_CELL (scm_gc_cell);
+- scm_sizet size = gc_cell->size_hint;
+-
+ // g_printerr ("GCCell freeing %u bytes (%p).\n", size,
gc_cell->free_func);
+-
+ gc_cell->free_func (gc_cell->data);
+ g_free (gc_cell);
+-
+- return size;
++ return 0;
+ }
+
+
+@@ -124,12 +196,10 @@ bse_scm_make_gc_plateau (guint size_hint)
+ {
+ SCM s_gcplateau = SCM_UNSPECIFIED;
+ GcPlateau *gp = g_new (GcPlateau, 1);
+-
+ scm_glue_gc_plateau_blocker++;
+ gp->size_hint = size_hint;
+ gp->active_plateau = TRUE;
+ SCM_NEWSMOB (s_gcplateau, tc_glue_gc_plateau, gp);
+- scm_done_malloc (gp->size_hint);
+ return s_gcplateau;
+ }
+
+@@ -137,9 +207,7 @@ void
+ bse_scm_destroy_gc_plateau (SCM s_gcplateau)
+ {
+ GcPlateau *gp;
+-
+ g_assert (SCM_IS_GLUE_GC_PLATEAU (s_gcplateau));
+-
+ gp = SCM_GET_GLUE_GC_PLATEAU (s_gcplateau);
+ if (gp->active_plateau)
+ {
+@@ -152,15 +220,12 @@ bse_scm_destroy_gc_plateau (SCM s_gcplateau)
+ }
+
+ static scm_sizet
+-bse_scm_gc_plateau_free (SCM s_gcplateau)
++bse_scm_gc_plateau_free (SCM s_gcplateau) /* called from any thread */
+ {
+ GcPlateau *gp = SCM_GET_GLUE_GC_PLATEAU (s_gcplateau);
+- guint size_hint = gp->size_hint;
+-
+ bse_scm_destroy_gc_plateau (s_gcplateau);
+ g_free (gp);
+-
+- return size_hint;
++ return 0;
+ }
+
+
+@@ -186,17 +251,17 @@ bse_scm_glue_rec_new (SCM sfields)
+ SfiRec *rec;
+ SCM s_rec = 0;
+ if (!SCM_UNBNDP (sfields))
+- SCM_ASSERT (SCM_CONSP (sfields) || SCM_EQ_P (sfields, SCM_EOL),
sfields, SCM_ARG1, "bse-rec-new");
++ SCM_ASSERT (IS_SCM_PAIR (sfields) || SCM_EQ_P (sfields, SCM_EOL),
sfields, SCM_ARG1, "bse-rec-new");
+ rec = sfi_rec_new ();
+ s_rec = bse_scm_from_glue_rec (rec);
+ sfi_rec_unref (rec);
+ if (!SCM_UNBNDP (sfields))
+ {
+ SCM node;
+- for (node = sfields; SCM_CONSP (node); node = SCM_CDR (node))
++ for (node = sfields; IS_SCM_PAIR (node); node = SCM_CDR (node))
+ {
+ SCM scons = SCM_CAR (node);
+- SCM_ASSERT (SCM_CONSP (scons), sfields, SCM_ARG1, "bse-rec-new");
++ SCM_ASSERT (IS_SCM_PAIR (scons), sfields, SCM_ARG1,
"bse-rec-new");
+ bse_scm_glue_rec_set (s_rec, SCM_CAR (scons), SCM_CDR (scons));
+ }
+ }
+@@ -204,10 +269,9 @@ bse_scm_glue_rec_new (SCM sfields)
+ }
+
+ static scm_sizet
+-bse_scm_free_glue_rec (SCM scm_rec)
++bse_scm_free_glue_rec (SCM scm_rec) /* called from any thread */
+ {
+ SfiRec *rec = SCM_GET_GLUE_REC (scm_rec);
+-
+ sfi_rec_unref (rec);
+ return 0;
+ }
+@@ -252,10 +316,10 @@ bse_scm_glue_rec_get (SCM scm_rec,
+ SCM s_val;
+
+ SCM_ASSERT (SCM_IS_GLUE_REC (scm_rec), scm_rec, SCM_ARG1, "bse-rec-get");
+- SCM_ASSERT (SCM_SYMBOLP (s_field), s_field, SCM_ARG2, "bse-rec-get");
++ SCM_ASSERT (IS_SCM_SYMBOL (s_field), s_field, SCM_ARG2, "bse-rec-get");
+
+ rec = SCM_GET_GLUE_REC (scm_rec);
+- name = g_strndup (SCM_ROCHARS (s_field), SCM_LENGTH (s_field));
++ name = strdup_from_scm (s_field);
+ val = sfi_rec_get (rec, name);
+ g_free (name);
+ if (val)
+@@ -278,13 +342,13 @@ bse_scm_glue_rec_set (SCM scm_rec,
+ gchar *name;
+
+ SCM_ASSERT (SCM_IS_GLUE_REC (scm_rec), scm_rec, SCM_ARG1, "bse-rec-set");
+- SCM_ASSERT (SCM_SYMBOLP (s_field), s_field, SCM_ARG2, "bse-rec-set");
++ SCM_ASSERT (IS_SCM_SYMBOL (s_field), s_field, SCM_ARG2, "bse-rec-set");
+
+ rec = SCM_GET_GLUE_REC (scm_rec);
+ val = bse_value_from_scm (s_value);
+ if (!val)
+ SCM_ASSERT (FALSE, s_value, SCM_ARG3, "bse-rec-set");
+- name = g_strndup (SCM_ROCHARS (s_field), SCM_LENGTH (s_field));
++ name = strdup_from_scm (s_field);
+ sfi_rec_set (rec, name, val);
+ g_free (name);
+ bse_scm_destroy_gc_plateau (gcplateau);
+@@ -324,7 +388,7 @@ bse_scm_proxy_print (SCM scm_p1,
+ {
+ SfiProxy p1 = SCM_GET_GLUE_PROXY (scm_p1);
+ char buffer[128];
+- g_snprintf (buffer, sizeof (buffer), "%08lx (ID:%04lx)", (unsigned long)
&SCM_SMOB_DATA (scm_p1), (unsigned long) p1);
++ g_snprintf (buffer, sizeof (buffer), "%08lx (ID:%04lx)", (unsigned long)
SCM_SMOB_DATA (scm_p1), (unsigned long) p1);
+ scm_puts ("#<SfiProxy ", port);
+ scm_puts (buffer, port);
+ scm_puts (">", port);
+@@ -377,23 +441,23 @@ static GValue*
+ bse_value_from_scm (SCM sval)
+ {
+ GValue *value;
+- if (SCM_BOOLP (sval))
++ if (IS_SCM_BOOL (sval))
+ value = sfi_value_bool (!SCM_FALSEP (sval));
+- else if (SCM_INUMP (sval))
+- value = sfi_value_int (scm_num2long (sval, 1, "bse_value_from_scm"));
++ else if (IS_SCM_INT (sval))
++ value = sfi_value_int (num_from_scm (sval));
++ else if (IS_SCM_BIG (sval))
++ value = sfi_value_num (num_from_scm (sval));
+ else if (SCM_REALP (sval))
+ value = sfi_value_real (scm_num2dbl (sval, "bse_value_from_scm"));
+- else if (SCM_BIGP (sval))
+- value = sfi_value_num (scm_num2long_long (sval, 1,
"bse_value_from_scm"));
+- else if (SCM_SYMBOLP (sval))
+- value = sfi_value_lchoice (SCM_ROCHARS (sval), SCM_LENGTH (sval));
+- else if (SCM_ROSTRINGP (sval))
+- value = sfi_value_lstring (SCM_ROCHARS (sval), SCM_LENGTH (sval));
+- else if (SCM_CONSP (sval))
++ else if (IS_SCM_SYMBOL (sval))
++ value = choice_value_from_scm (sval);
++ else if (IS_SCM_STRING (sval))
++ value = string_value_from_scm (sval);
++ else if (IS_SCM_PAIR (sval))
+ {
+ SfiSeq *seq = sfi_seq_new ();
+ SCM node;
+- for (node = sval; SCM_CONSP (node); node = SCM_CDR (node))
++ for (node = sval; IS_SCM_PAIR (node); node = SCM_CDR (node))
+ {
+ GValue *v = bse_value_from_scm (SCM_CAR (node));
+ sfi_seq_append (seq, v);
+@@ -495,13 +559,13 @@ bse_scm_glue_set_prop (SCM s_proxy,
+ GValue *value;
+
+ SCM_ASSERT (SCM_IS_GLUE_PROXY (s_proxy), s_proxy, SCM_ARG1,
"bse-glue-set-prop");
+- SCM_ASSERT (SCM_STRINGP (s_prop_name), s_prop_name, SCM_ARG2,
"bse-glue-set-prop");
++ SCM_ASSERT (IS_SCM_STRING (s_prop_name), s_prop_name, SCM_ARG2,
"bse-glue-set-prop");
+
+ BSE_SCM_DEFER_INTS ();
+
+ proxy = SCM_GET_GLUE_PROXY (s_proxy);
+- prop_name = g_strndup (SCM_ROCHARS (s_prop_name), SCM_LENGTH
(s_prop_name));
+- bse_scm_enter_gc (&gclist, prop_name, g_free, SCM_LENGTH (s_prop_name));
++ prop_name = strdup_from_scm (s_prop_name);
++ bse_scm_enter_gc (&gclist, prop_name, g_free, STRING_LENGTH_FROM_SCM
(s_prop_name));
+
+ value = bse_value_from_scm (s_value);
+ if (value)
+@@ -530,13 +594,13 @@ bse_scm_glue_get_prop (SCM s_proxy,
+ const GValue *value;
+
+ SCM_ASSERT (SCM_IS_GLUE_PROXY (s_proxy), s_proxy, SCM_ARG1,
"bse-glue-get-prop");
+- SCM_ASSERT (SCM_STRINGP (s_prop_name), s_prop_name, SCM_ARG2,
"bse-glue-get-prop");
++ SCM_ASSERT (IS_SCM_STRING (s_prop_name), s_prop_name, SCM_ARG2,
"bse-glue-get-prop");
+
+ BSE_SCM_DEFER_INTS ();
+
+ proxy = SCM_GET_GLUE_PROXY (s_proxy);
+- prop_name = g_strndup (SCM_ROCHARS (s_prop_name), SCM_LENGTH
(s_prop_name));
+- bse_scm_enter_gc (&gclist, prop_name, g_free, SCM_LENGTH (s_prop_name));
++ prop_name = strdup_from_scm (s_prop_name);
++ bse_scm_enter_gc (&gclist, prop_name, g_free, STRING_LENGTH_FROM_SCM
(s_prop_name));
+
+ value = sfi_glue_proxy_get_property (proxy, prop_name);
+ if (value)
+@@ -562,17 +626,17 @@ bse_scm_glue_call (SCM s_proc_name,
+ GValue *value;
+ SfiSeq *seq;
+
+- SCM_ASSERT (SCM_STRINGP (s_proc_name), s_proc_name, SCM_ARG1,
"bse-glue-call");
+- SCM_ASSERT (SCM_CONSP (s_arg_list) || s_arg_list == SCM_EOL, s_arg_list,
SCM_ARG2, "bse-glue-call");
++ SCM_ASSERT (IS_SCM_STRING (s_proc_name), s_proc_name, SCM_ARG1,
"bse-glue-call");
++ SCM_ASSERT (IS_SCM_PAIR (s_arg_list) || s_arg_list == SCM_EOL,
s_arg_list, SCM_ARG2, "bse-glue-call");
+
+ BSE_SCM_DEFER_INTS ();
+
+- proc_name = g_strndup (SCM_ROCHARS (s_proc_name), SCM_LENGTH
(s_proc_name));
+- bse_scm_enter_gc (&gclist, proc_name, g_free, SCM_LENGTH (s_proc_name));
++ proc_name = strdup_from_scm (s_proc_name);
++ bse_scm_enter_gc (&gclist, proc_name, g_free, STRING_LENGTH_FROM_SCM
(s_proc_name));
+
+ seq = sfi_seq_new ();
+- bse_scm_enter_gc (&gclist, seq, sfi_seq_unref, 1024);
+- for (node = s_arg_list; SCM_CONSP (node); node = SCM_CDR (node))
++ bse_scm_enter_gc (&gclist, seq, sfi_seq_unref, 1024); // FIXME: GC
callbacks may run in any thread
++ for (node = s_arg_list; IS_SCM_PAIR (node); node = SCM_CDR (node))
+ {
+ SCM arg = SCM_CAR (node);
+
+@@ -648,7 +712,7 @@ signal_closure_marshal (GClosure *closure,
+ SignalData *sdata = closure->data;
+ sdata->n_args = n_param_values;
+ sdata->args = param_values;
+- scm_internal_cwdr ((scm_catch_body_t) signal_marshal_sproc, sdata,
++ scm_internal_cwdr ((scm_t_catch_body) signal_marshal_sproc, sdata,
+ scm_handle_by_message_noexit, "BSE", &stack_item);
+ }
+
+@@ -665,7 +729,7 @@ bse_scm_signal_connect (SCM s_proxy,
+ SCM_ASSERT (SCM_IS_GLUE_PROXY (s_proxy), s_proxy, SCM_ARG1,
"bse-signal-connect");
+ proxy = SCM_GET_GLUE_PROXY (s_proxy);
+
+- SCM_ASSERT (SCM_STRINGP (s_signal), s_signal, SCM_ARG2,
"bse-signal-connect");
++ SCM_ASSERT (IS_SCM_STRING (s_signal), s_signal, SCM_ARG2,
"bse-signal-connect");
+ SCM_ASSERT (gh_procedure_p (s_lambda), s_lambda, SCM_ARG3,
"bse-signal-connect");
+
+ scm_gc_protect_object (s_lambda);
+@@ -673,7 +737,7 @@ bse_scm_signal_connect (SCM s_proxy,
+ BSE_SCM_DEFER_INTS ();
+ sdata = g_new0 (SignalData, 1);
+ sdata->proxy = proxy;
+- sdata->signal = g_strndup (SCM_ROCHARS (s_signal), SCM_LENGTH (s_signal));
++ sdata->signal = strdup_from_scm (s_signal);
+ sdata->s_lambda = s_lambda;
+ closure = g_closure_new_simple (sizeof (GClosure), sdata);
+ g_closure_add_finalize_notifier (closure, sdata, signal_data_free);
+@@ -707,11 +771,11 @@ SCM
+ bse_scm_choice_match (SCM s_ch1,
+ SCM s_ch2)
+ {
+- SCM_ASSERT (SCM_SYMBOLP (s_ch1), s_ch1, SCM_ARG1, "bse-choice-match?");
+- SCM_ASSERT (SCM_SYMBOLP (s_ch2), s_ch2, SCM_ARG2, "bse-choice-match?");
++ SCM_ASSERT (IS_SCM_SYMBOL (s_ch1), s_ch1, SCM_ARG1, "bse-choice-match?");
++ SCM_ASSERT (IS_SCM_SYMBOL (s_ch2), s_ch2, SCM_ARG2, "bse-choice-match?");
+
+- gchar *ch1 = g_strndup (SCM_ROCHARS (s_ch1), SCM_LENGTH (s_ch1));
+- gchar *ch2 = g_strndup (SCM_ROCHARS (s_ch2), SCM_LENGTH (s_ch2));
++ gchar *ch1 = strdup_from_scm (s_ch1);
++ gchar *ch2 = strdup_from_scm (s_ch2);
+ int res = sfi_choice_match (ch1, ch2);
+ g_free (ch1);
+ g_free (ch2);
+@@ -719,11 +783,10 @@ bse_scm_choice_match (SCM s_ch1,
+ }
+
+ static char*
+-text_concat (const char *prefix,
+- char *text,
+- int len)
++text_concat_scm (const char *prefix,
++ SCM s_string)
+ {
+- char *p2 = g_strndup (text, len);
++ char *p2 = strdup_from_scm (s_string);
+ char *result = g_strconcat (prefix ? prefix : "", prefix && p2 ? "\n" :
"", p2, NULL);
+ g_free (p2);
+ return result;
+@@ -755,11 +818,11 @@ bse_scm_script_message (SCM s_type,
+ {
+ SCM gcplateau = bse_scm_make_gc_plateau (4096);
+
+- SCM_ASSERT (SCM_SYMBOLP (s_type), s_type, SCM_ARG2,
"bse-script-message");
++ SCM_ASSERT (IS_SCM_SYMBOL (s_type), s_type, SCM_ARG2,
"bse-script-message");
+
+ /* figure message level */
+ BSE_SCM_DEFER_INTS();
+- gchar *strtype = g_strndup (SCM_ROCHARS (s_type), SCM_LENGTH (s_type));
++ gchar *strtype = strdup_from_scm (s_type);
+ guint mtype = sfi_msg_lookup_type (strtype);
+ g_free (strtype);
+ BSE_SCM_ALLOW_INTS();
+@@ -769,7 +832,7 @@ bse_scm_script_message (SCM s_type,
+ /* figure argument list length */
+ guint i = 0;
+ SCM node = s_bits;
+- while (SCM_CONSP (node))
++ while (IS_SCM_PAIR (node))
+ node = SCM_CDR (node), i++;
+ if (i == 0)
+ scm_misc_error ("bse-script-message", "Wrong number of arguments",
SCM_BOOL_F);
+@@ -778,53 +841,53 @@ bse_scm_script_message (SCM s_type,
+ char *title = NULL, *primary = NULL, *secondary = NULL, *detail = NULL,
*check = NULL;
+ i = 2;
+ node = s_bits;
+- while (SCM_CONSP (node))
++ while (IS_SCM_PAIR (node))
+ {
+ /* read first arg, a symbol */
+ SCM arg1 = SCM_CAR (node);
+ node = SCM_CDR (node);
+ i++;
+- if (!SCM_SYMBOLP (arg1))
++ if (!IS_SCM_SYMBOL (arg1))
+ scm_wrong_type_arg ("bse-script-message", i, arg1);
+ /* check symbol contents */
+ BSE_SCM_DEFER_INTS();
+- gchar *mtag = g_strndup (SCM_ROCHARS (arg1), SCM_LENGTH (arg1));
++ gchar *mtag = strdup_from_scm (arg1);
+ int tag = msg_bit_type_match (mtag);
+ g_free (mtag);
+ BSE_SCM_ALLOW_INTS();
+ if (tag < 0)
+ scm_wrong_type_arg ("bse-script-message", i, arg1);
+ /* list must continue */
+- if (!SCM_CONSP (node))
++ if (!IS_SCM_PAIR (node))
+ scm_misc_error ("bse-script-message", "Wrong number of arguments",
SCM_BOOL_F);
+ /* read second arg, a string */
+ SCM arg2 = SCM_CAR (node);
+ node = SCM_CDR (node);
+ i++;
+- if (!SCM_STRINGP (arg2))
++ if (!IS_SCM_STRING (arg2))
+ scm_wrong_type_arg ("bse-script-message", i, arg2);
+ /* add message bit from string */
+ BSE_SCM_DEFER_INTS();
+ switch (tag)
+ {
+ case 0:
+- title = text_concat (title, SCM_ROCHARS (arg2), SCM_LENGTH
(arg2));
++ title = text_concat_scm (title, arg2);
+ sfi_glue_gc_add (title, g_free);
+ break;
+ case 1:
+- primary = text_concat (primary, SCM_ROCHARS (arg2), SCM_LENGTH
(arg2));
++ primary = text_concat_scm (primary, arg2);
+ sfi_glue_gc_add (primary, g_free);
+ break;
+ case 2:
+- secondary = text_concat (secondary, SCM_ROCHARS (arg2),
SCM_LENGTH (arg2));
++ secondary = text_concat_scm (secondary, arg2);
+ sfi_glue_gc_add (secondary, g_free);
+ break;
+ case 3:
+- detail = text_concat (detail, SCM_ROCHARS (arg2), SCM_LENGTH
(arg2));
++ detail = text_concat_scm (detail, arg2);
+ sfi_glue_gc_add (detail, g_free);
+ break;
+ case 4:
+- check = text_concat (check, SCM_ROCHARS (arg2), SCM_LENGTH
(arg2));
++ check = text_concat_scm (check, arg2);
+ sfi_glue_gc_add (check, g_free);
+ break;
+ }
+@@ -878,16 +941,16 @@ bse_scm_script_register (SCM s_name,
+ SCM node;
+ guint i;
+
+- SCM_ASSERT (SCM_SYMBOLP (s_name), s_name, SCM_ARG1,
"bse-script-register");
+- SCM_ASSERT (SCM_STRINGP (s_options), s_options, SCM_ARG2,
"bse-script-register");
+- SCM_ASSERT (SCM_STRINGP (s_category), s_category, SCM_ARG3,
"bse-script-register");
+- SCM_ASSERT (SCM_STRINGP (s_blurb), s_blurb, SCM_ARG4,
"bse-script-register");
+- SCM_ASSERT (SCM_STRINGP (s_author), s_author, SCM_ARG5,
"bse-script-register");
+- SCM_ASSERT (SCM_STRINGP (s_license), s_license, SCM_ARG6,
"bse-script-register");
+- for (node = s_params, i = 7; SCM_CONSP (node); node = SCM_CDR (node), i++)
++ SCM_ASSERT (IS_SCM_SYMBOL (s_name), s_name, SCM_ARG1,
"bse-script-register");
++ SCM_ASSERT (IS_SCM_STRING (s_options), s_options, SCM_ARG2,
"bse-script-register");
++ SCM_ASSERT (IS_SCM_STRING (s_category), s_category, SCM_ARG3,
"bse-script-register");
++ SCM_ASSERT (IS_SCM_STRING (s_blurb), s_blurb, SCM_ARG4,
"bse-script-register");
++ SCM_ASSERT (IS_SCM_STRING (s_author), s_author, SCM_ARG5,
"bse-script-register");
++ SCM_ASSERT (IS_SCM_STRING (s_license), s_license, SCM_ARG6,
"bse-script-register");
++ for (node = s_params, i = 7; IS_SCM_PAIR (node); node = SCM_CDR (node),
i++)
+ {
+ SCM arg = SCM_CAR (node);
+- if (!SCM_STRINGP (arg))
++ if (!IS_SCM_STRING (arg))
+ scm_wrong_type_arg ("bse-script-register", i, arg);
+ }
+
+@@ -913,32 +976,32 @@ bse_scm_script_register (SCM s_name,
+ SfiSeq *seq = sfi_seq_new ();
+ GValue *val, *rval;
+
+- sfi_seq_append (seq, val = sfi_value_lstring (SCM_ROCHARS (s_name),
SCM_LENGTH (s_name)));
++ sfi_seq_append (seq, val = string_value_from_scm (s_name));
+ sfi_value_free (val);
+- sfi_seq_append (seq, val = sfi_value_lstring (SCM_ROCHARS
(s_options), SCM_LENGTH (s_options)));
++ sfi_seq_append (seq, val = string_value_from_scm (s_options));
+ sfi_value_free (val);
+- sfi_seq_append (seq, val = sfi_value_lstring (SCM_ROCHARS
(s_category), SCM_LENGTH (s_category)));
++ sfi_seq_append (seq, val = string_value_from_scm (s_category));
+ sfi_value_free (val);
+- sfi_seq_append (seq, val = sfi_value_lstring (SCM_ROCHARS (s_blurb),
SCM_LENGTH (s_blurb)));
++ sfi_seq_append (seq, val = string_value_from_scm (s_blurb));
+ sfi_value_free (val);
+- if (SCM_STRINGP (s_file))
+- sfi_seq_append (seq, val = sfi_value_lstring (SCM_ROCHARS (s_file),
SCM_LENGTH (s_file)));
++ if (IS_SCM_STRING (s_file))
++ sfi_seq_append (seq, val = string_value_from_scm (s_file));
+ else
+ sfi_seq_append (seq, val = sfi_value_string ("Scheme"));
+ sfi_value_free (val);
+ char buffer[64] = "";
+- g_snprintf (buffer, 64, "%u", SCM_INUMP (s_line) ? SCM_INUM (s_line)
+ 1 : 0);
++ g_snprintf (buffer, 64, "%u", (int) (IS_SCM_SFI_NUM (s_line) ?
num_from_scm (s_line) + 1 : 0));
+ sfi_seq_append (seq, val = sfi_value_string (buffer));
+ sfi_value_free (val);
+- sfi_seq_append (seq, val = sfi_value_lstring (SCM_ROCHARS (s_author),
SCM_LENGTH (s_author)));
++ sfi_seq_append (seq, val = string_value_from_scm (s_author));
+ sfi_value_free (val);
+- sfi_seq_append (seq, val = sfi_value_lstring (SCM_ROCHARS
(s_license), SCM_LENGTH (s_license)));
++ sfi_seq_append (seq, val = string_value_from_scm (s_license));
+ sfi_value_free (val);
+
+- for (node = s_params; SCM_CONSP (node); node = SCM_CDR (node))
++ for (node = s_params; IS_SCM_PAIR (node); node = SCM_CDR (node))
+ {
+ SCM arg = SCM_CAR (node);
+- sfi_seq_append (seq, val = sfi_value_lstring (SCM_ROCHARS (arg),
SCM_LENGTH (arg)));
++ sfi_seq_append (seq, val = string_value_from_scm (arg));
+ sfi_value_free (val);
+ }
+
+@@ -947,7 +1010,7 @@ bse_scm_script_register (SCM s_name,
+ sfi_value_free (val);
+ if (SFI_VALUE_HOLDS_STRING (rval))
+ {
+- gchar *name = g_strndup (SCM_ROCHARS (s_name), SCM_LENGTH (s_name));
++ gchar *name = strdup_from_scm (s_name);
+ g_message ("while registering \"%s\": %s", name,
sfi_value_get_string (rval));
+ g_free (name);
+ }
+@@ -962,9 +1025,9 @@ bse_scm_script_register (SCM s_name,
+ SCM
+ bse_scm_gettext (SCM s_string)
+ {
+- SCM_ASSERT (SCM_STRINGP (s_string), s_string, SCM_ARG1, "bse-gettext");
++ SCM_ASSERT (IS_SCM_STRING (s_string), s_string, SCM_ARG1, "bse-gettext");
+ BSE_SCM_DEFER_INTS ();
+- gchar *string = g_strndup (SCM_ROCHARS (s_string), SCM_LENGTH (s_string));
++ gchar *string = strdup_from_scm (s_string);
+ const gchar *cstring = bse_gettext (string);
+ SCM s_ret = scm_makfrom0str (cstring);
+ g_free (string);
+@@ -975,9 +1038,9 @@ bse_scm_gettext (SCM s_string)
+ SCM
+ bse_scm_gettext_q (SCM s_string)
+ {
+- SCM_ASSERT (SCM_STRINGP (s_string), s_string, SCM_ARG1, "bse-gettext-q");
++ SCM_ASSERT (IS_SCM_STRING (s_string), s_string, SCM_ARG1,
"bse-gettext-q");
+ BSE_SCM_DEFER_INTS ();
+- gchar *string = g_strndup (SCM_ROCHARS (s_string), SCM_LENGTH (s_string));
++ gchar *string = strdup_from_scm (s_string);
+ const gchar *cstring = bse_gettext (string);
+ if (string == cstring)
+ {
+diff --git a/shell/bsescminterp.h b/shell/bsescminterp.h
+index 73842bb..e8dc017 100644
+--- a/shell/bsescminterp.h
++++ b/shell/bsescminterp.h
+@@ -23,13 +23,6 @@
+
+ G_BEGIN_DECLS
+
+-/* guard around GC-protected code portions,
+- * with incremental int-blocking. guile recovers
+- * from unbalanced defer/allow pairs.
+- */
+-#define BSE_SCM_DEFER_INTS() SCM_REDEFER_INTS
+-#define BSE_SCM_ALLOW_INTS() SCM_REALLOW_INTS
+-
+ typedef struct _BseSCMWire BseSCMWire;
+
+
diff --git a/audio-creation/glame/CONFIGURE b/audio-creation/glame/CONFIGURE
deleted file mode 100755
index 55601be..0000000
--- a/audio-creation/glame/CONFIGURE
+++ /dev/null
@@ -1,16 +0,0 @@
-if [ -f /etc/sorcery/local/depends/guile.p ]
-then
- . /etc/sorcery/local/depends/guile.p
-fi
-
-if [ "$G_18" = "y" ]
-then
- message "\n${MESSAGE_COLOR}" \
- "${SPELL} isn't released for guile 1.8, so it may not works\n\n"
-
- if ! query "Would you like to continue?" n;
- then
- message "${MESSAGE_COLOR}Please recast later!\n"
- return 1
- fi
-fi
diff --git a/audio-creation/glame/DEPENDS b/audio-creation/glame/DEPENDS
index de9eaa8..1a1f4da 100755
--- a/audio-creation/glame/DEPENDS
+++ b/audio-creation/glame/DEPENDS
@@ -1,35 +1,19 @@
-depends ladspa &&
depends guile &&

-optional_depends glade \
- "" \
- "" \
- "for GUI builder" &&
-
-optional_depends gnome-libs \
- "--enable-gui" \
- "--disable-gui" \
- "for a GUI" &&
-
-optional_depends libxml \
- "--with-libxml" \
- "--without-libxml" \
- "for XML 1.0 support" &&
+optional_depends ladspa \
+ "--enable-ladspa" \
+ "--disable-ladspa" \
+ "for LADSPA support" &&

optional_depends libxml2 \
"--with-libxml2" \
"--without-libxml2" \
"for XML 2.0 support" &&

-optional_depends glib2 \
- "--with-glib2" \
- "--without-glib2" \
- "support for GUI, also requires gtk+2" &&
-
-optional_depends guile \
- "--with-guile" \
- "--without-guile" \
- "support for scripting" &&
+optional_depends libgnomeui \
+ "--enable-gui" \
+ "--disable-gui" \
+ "for a graphical user interface" &&

optional_depends audiofile \
"--with-audiofile" \
diff --git a/audio-creation/glame/DETAILS b/audio-creation/glame/DETAILS
index 60ac578..af4c51c 100755
--- a/audio-creation/glame/DETAILS
+++ b/audio-creation/glame/DETAILS
@@ -1,9 +1,9 @@
SPELL=glame
- VERSION=1.0.3
+ VERSION=2.0.1
SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:3c7f4f40ea6f527cca39f9f50f99e7b7b8f0ffd66399eb390db9c835bf349e6e87d69a50c6f906ef3e953191249e4ecaf702e7c9edc733ea686fb6b5926efda9
WEB_SITE=http://glame.sourceforge.net/
ENTERED=20031213
LICENSE[0]=GPL
diff --git a/audio-creation/glame/HISTORY b/audio-creation/glame/HISTORY
index 4170f2f..e315234 100644
--- a/audio-creation/glame/HISTORY
+++ b/audio-creation/glame/HISTORY
@@ -1,3 +1,11 @@
+2007-04-23 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 2.0.1
+ * CONFIGURE: removed
+ * DEPENDS: made ladspa optional, removed gnome1 stuff, added
+ optional_depends on libgnomeui, removed libxml, removed
+ optional_depends on guile (it's already a required dep)
+ * PRE_BUILD: added sedit to make it compatible with guile 1.8
+
2006-10-11 Maurizio Boriani <baux AT sourcemage.org>
* CONFIGURE: Add warning about guile major update.

diff --git a/audio-creation/glame/PRE_BUILD b/audio-creation/glame/PRE_BUILD
new file mode 100755
index 0000000..aadb42c
--- /dev/null
+++ b/audio-creation/glame/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+# compatibility with guile > 1.7
+sed -i 's/SCM_MINOR_VERSION == 7/SCM_MINOR_VERSION >= 7/'
src/include/glame_guile_compat.h
diff --git a/audio-creation/glame/glame-2.0.1.tar.gz.sig
b/audio-creation/glame/glame-2.0.1.tar.gz.sig
new file mode 100644
index 0000000..0f03c02
Binary files /dev/null and b/audio-creation/glame/glame-2.0.1.tar.gz.sig
differ
diff --git a/audio-creation/snd/CONFIGURE b/audio-creation/snd/CONFIGURE
index b8601fc..80ff16e 100755
--- a/audio-creation/snd/CONFIGURE
+++ b/audio-creation/snd/CONFIGURE
@@ -1,20 +1,3 @@
-if [ -f /etc/sorcery/local/depends/guile.p ]
-then
- . /etc/sorcery/local/depends/guile.p
-fi
-
-if [ "$G_18" = "y" ]
-then
- message "\n${MESSAGE_COLOR}" \
- "${SPELL} isn't released for guile 1.8, so it may not works\n\n"
-
- if ! query "Would you like to continue?" n;
- then
- message "${MESSAGE_COLOR}Please recast later!\n"
- return 1
- fi
-fi
-
config_query MIDI "include sndlib midi module?" n
config_query HOBBIT "include arity check support for hobbit?" n
config_query RUBY "use ruby as scripting language (instead of Guile)?" y
diff --git a/audio-creation/snd/DEPENDS b/audio-creation/snd/DEPENDS
index 1ac3d43..30fbd1e 100755
--- a/audio-creation/snd/DEPENDS
+++ b/audio-creation/snd/DEPENDS
@@ -2,7 +2,7 @@ if [ "$GUI" == "y" ]
then
if [ "$GTK" == "y" ]
then
- depends gtkglext "--with-gtk --without-motif"
+ depends gtk+2 "--with-gtk --without-motif"
else
depends openmotif "--with-motif --without-gtk"
fi
@@ -40,6 +40,10 @@ optional_depends OPENGL \
"--without-gl" \
"for openGL display (rocks!)" &&

+if [[ $(get_spell_provider $SPELL OPENGL) ]] && is_depends_enabled $SPELL
gtk+2; then
+ depends gtkglext
+fi &&
+
optional_depends ladspa \
"--with-ladspa" \
"--without-ladspa" \
@@ -53,4 +57,6 @@ optional_depends gsl \
optional_depends fftw2 \
"--with-fftw" \
"--without-fftw" \
- "better FFT support"
+ "better FFT support" &&
+
+optional_depends MPG123 "" "" "for mpg123 support"
diff --git a/audio-creation/snd/DETAILS b/audio-creation/snd/DETAILS
index 93608cf..807e7a9 100755
--- a/audio-creation/snd/DETAILS
+++ b/audio-creation/snd/DETAILS
@@ -1,9 +1,9 @@
SPELL=snd
- VERSION=8.3
+ VERSION=8.9
SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE_DIRECTORY=$BUILD_DIRECTORY/snd-8
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:643e68e6713fe5fb3c22a4c6bf53cf2ff179178cf9b6783323a6cd454874cca4efd1ce175d98fbe6bedab05b9a91ed1688d9801bbfdbe2d70d56552bdf2e76d7
WEB_SITE=http://snd.sf.net/
ENTERED=20020501
LICENSE[0]=ART
diff --git a/audio-creation/snd/HISTORY b/audio-creation/snd/HISTORY
index 8ed8da2..42b930b 100644
--- a/audio-creation/snd/HISTORY
+++ b/audio-creation/snd/HISTORY
@@ -1,3 +1,10 @@
+2007-04-24 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 8.9
+ * CONFIGURE: removed warning about guile
+ * DEPENDS: only depend on gtkglext if OPENGL and gtk+2 are used, added
+ optional_depends on MPG123
+ * PRE_BUILD: fix compile with mpg321
+
2006-10-11 Maurizio Boriani <baux AT sourcemage.org>
* CONFIGURE: Add warning about guile major update.

diff --git a/audio-creation/snd/PRE_BUILD b/audio-creation/snd/PRE_BUILD
new file mode 100755
index 0000000..4ce19b9
--- /dev/null
+++ b/audio-creation/snd/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i 's/if HAVE_MPG321/ifdef PATH_MPG321/' snd-file.c
diff --git a/audio-creation/snd/snd-8.9.tar.gz.sig
b/audio-creation/snd/snd-8.9.tar.gz.sig
new file mode 100644
index 0000000..d8ad92e
Binary files /dev/null and b/audio-creation/snd/snd-8.9.tar.gz.sig differ
diff --git a/crypto/crank/BUILD b/crypto/crank/BUILD
new file mode 100755
index 0000000..146cdf1
--- /dev/null
+++ b/crypto/crank/BUILD
@@ -0,0 +1,2 @@
+OPTS="--without-guile $OPTS" &&
+default_build
diff --git a/crypto/crank/CONFIGURE b/crypto/crank/CONFIGURE
deleted file mode 100755
index 55601be..0000000
--- a/crypto/crank/CONFIGURE
+++ /dev/null
@@ -1,16 +0,0 @@
-if [ -f /etc/sorcery/local/depends/guile.p ]
-then
- . /etc/sorcery/local/depends/guile.p
-fi
-
-if [ "$G_18" = "y" ]
-then
- message "\n${MESSAGE_COLOR}" \
- "${SPELL} isn't released for guile 1.8, so it may not works\n\n"
-
- if ! query "Would you like to continue?" n;
- then
- message "${MESSAGE_COLOR}Please recast later!\n"
- return 1
- fi
-fi
diff --git a/crypto/crank/DEPENDS b/crypto/crank/DEPENDS
index bf89350..552759f 100755
--- a/crypto/crank/DEPENDS
+++ b/crypto/crank/DEPENDS
@@ -1,2 +1 @@
-depends gtk+ &&
-depends guile
+depends gtk+
diff --git a/crypto/crank/HISTORY b/crypto/crank/HISTORY
index 67f1535..ba47af3 100644
--- a/crypto/crank/HISTORY
+++ b/crypto/crank/HISTORY
@@ -1,3 +1,8 @@
+2007-04-24 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFIGURE: removed
+ * DEPENDS: removed guile
+ * BUILD: added --without-guile to OPTS
+
2006-10-11 Maurizio Boriani <baux AT sourcemage.org>
* CONFIGURE: Add warning about guile major update.

diff --git a/database/guile-dbi/DETAILS b/database/guile-dbi/DETAILS
index 5fb94c8..7a535c4 100755
--- a/database/guile-dbi/DETAILS
+++ b/database/guile-dbi/DETAILS
@@ -1,14 +1,5 @@
SPELL=guile-dbi
-if [ -f /etc/sorcery/local/depends/guile.p ]
-then
- . /etc/sorcery/local/depends/guile.p
-fi
-if [ "$G_18" = "y" ]
-then
VERSION=2.0.0
-else
- VERSION=1.0.4
-fi
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/database/guile-dbi/HISTORY b/database/guile-dbi/HISTORY
index e21ae7f..e185881 100644
--- a/database/guile-dbi/HISTORY
+++ b/database/guile-dbi/HISTORY
@@ -1,3 +1,6 @@
+2007-04-24 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: only support guile 1.8
+
2006-10-11 Maurizio Boriani <baux AT sourcemage.org>
* DETAILS: Use version 1 for guile 1.6 and version
2 for guile 1.8.
diff --git a/devel/g-wrap/BUILD b/devel/g-wrap/BUILD
index 768567f..ef05e45 100755
--- a/devel/g-wrap/BUILD
+++ b/devel/g-wrap/BUILD
@@ -1,8 +1,3 @@
make_single &&
-
-if [ "${GWRAP_DEVEL}" == "y" ]; then
- CFLAGS="$CFLAGS -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include"
-fi &&
-
default_build &&
make_normal
diff --git a/devel/g-wrap/DETAILS b/devel/g-wrap/DETAILS
index a1ca5e9..9ad9c31 100755
--- a/devel/g-wrap/DETAILS
+++ b/devel/g-wrap/DETAILS
@@ -1,23 +1,15 @@
SPELL=g-wrap
-if [ "${GWRAP_DEVEL}" == "y" ]; then
- VERSION=1.9.6
+ VERSION=1.9.7
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=${SPELL}-${VERSION}.tar.gz.sig
SOURCE_URL[0]=http://savannah.nongnu.org/download/${SPELL}/${SOURCE}
SOURCE2_URL[0]=http://savannah.nongnu.org/download/${SPELL}/${SOURCE2}
SOURCE_GPG="g-wrap.gpg:${SOURCE2}:UPSTREAM_KEY"
SOURCE2_IGNORE=signature
-else
- VERSION=1.3.4
- SOURCE=${SPELL}-${VERSION}.tar.gz
- SOURCE_URL[0]=http://www.gnucash.org/pub/g-wrap/source/${SOURCE}
-
SOURCE_HASH=sha512:2dcf45c10b0fb9009c7b27542f9dea828c8ce4a8c792f8074e0311ef95cdf65c9b444535dc9c5f0eb85516f1bc732db8fc9a13e95ad7344149a8c2ea63b1c14d
-fi
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
LICENSE[0]=GPL
WEB_SITE=http://www.nongnu.org/g-wrap/
ENTERED=20011031
- PATCHLEVEL=1
KEYWORDS="devel"
SHORT="Tool for generating function wrappers for inter-language
calls"
cat << EOF
diff --git a/devel/g-wrap/HISTORY b/devel/g-wrap/HISTORY
index 6ee4cec..ce4866c 100644
--- a/devel/g-wrap/HISTORY
+++ b/devel/g-wrap/HISTORY
@@ -1,3 +1,11 @@
+2007-05-11 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PREPARE: removed
+ * DETAILS: only support devel version, old version fails with current
+ guile, updated to 1.9.7
+ * PRE_SUB_DEPENDS, SUB_DEPENDS: removed
+ * g-wrap.gpg: added authors current gpg key
+ * BUILD: removed old glib2 fixes
+
2007-04-19 Eric Sandall <sandalle AT sourcemage.org>
* PRE_SUB_DEPENDS, SUB_DEPENDS: gnucash2 requires g-wrap's devel
version (Bug #13722)
diff --git a/devel/g-wrap/PREPARE b/devel/g-wrap/PREPARE
deleted file mode 100755
index 6a0eda8..0000000
--- a/devel/g-wrap/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query GWRAP_DEVEL "Use devel version for GNOME2 gnucash?" n
diff --git a/devel/g-wrap/PRE_SUB_DEPENDS b/devel/g-wrap/PRE_SUB_DEPENDS
deleted file mode 100755
index 2d8a46a..0000000
--- a/devel/g-wrap/PRE_SUB_DEPENDS
+++ /dev/null
@@ -1,5 +0,0 @@
-case $THIS_SUB_DEPENDS in
- G_WRAP_DEVEL) [[ "$GWRAP_DEVEL" == "y" ]] && return 0 ;;
-esac
-
-return 1
diff --git a/devel/g-wrap/SUB_DEPENDS b/devel/g-wrap/SUB_DEPENDS
deleted file mode 100755
index 8f0963a..0000000
--- a/devel/g-wrap/SUB_DEPENDS
+++ /dev/null
@@ -1,7 +0,0 @@
-case $THIS_SUB_DEPENDS in
- G_WRAP_DEVEL) echo "Development version requested, forcing GWRAP_DEVEL=y"
- GWRAP_DEVEL=y
- persistent_add GWRAP_DEVEL;;
- *) echo "Unknown sub-dependecy: $THIS_SUB_DEPENDS"
- return 1;;
-esac
diff --git a/devel/g-wrap/g-wrap.gpg b/devel/g-wrap/g-wrap.gpg
index e783c46..2b7941f 100644
Binary files a/devel/g-wrap/g-wrap.gpg and b/devel/g-wrap/g-wrap.gpg differ
diff --git a/devel/greg/DETAILS b/devel/greg/DETAILS
index fd8f6d3..1ab8781 100755
--- a/devel/greg/DETAILS
+++ b/devel/greg/DETAILS
@@ -1,14 +1,5 @@
SPELL=greg
-if [ -f /etc/sorcery/local/depends/guile.p ]
-then
- . /etc/sorcery/local/depends/guile.p
-fi
-if [ "$G_18" = "y" ]
-then
VERSION=2.0.0
-else
- VERSION=1.5.0
-fi
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/devel/greg/HISTORY b/devel/greg/HISTORY
index 961da95..436b292 100644
--- a/devel/greg/HISTORY
+++ b/devel/greg/HISTORY
@@ -1,3 +1,6 @@
+2007-04-23 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: removed multi-version support, just support current stable
+
2006-10-11 Maurizio Boriani <baux AT sourcemage.org>
* DETAILS: Use version 1 for guile 1.6 and 2 for
guile 1.8.
diff --git a/devel/guile/BUILD b/devel/guile/BUILD
deleted file mode 100755
index 26d6139..0000000
--- a/devel/guile/BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-sedit "s/extern int inet_aton/\/\/ extern int inet_aton/" \
- libguile/net_db.c &&
-
-libtoolize -c -f &&
-make_single &&
-default_build &&
-make_normal
diff --git a/devel/guile/DEPENDS b/devel/guile/DEPENDS
index c3c0ebb..93faf5a 100755
--- a/devel/guile/DEPENDS
+++ b/devel/guile/DEPENDS
@@ -1,8 +1 @@
-depends libtool &&
-
-if [ "$G_18" == "y" ]
-then
- depends gmp
-else
- optional_depends gmp "" "" "for bignums support"
-fi
+depends gmp
diff --git a/devel/guile/DETAILS b/devel/guile/DETAILS
index 81b0e79..e4af8ad 100755
--- a/devel/guile/DETAILS
+++ b/devel/guile/DETAILS
@@ -1,21 +1,15 @@
SPELL=guile
-if [ "$G_18" == "y" ];
-then
VERSION=1.8.1
-else
- VERSION=1.6.8
- PATCHLEVEL=1
-fi
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
SOURCE2_URL[0]=$GNU_URL/$SPELL/$SOURCE2
- SOURCE_GPG=gnu-verified.gpg:$SOURCE2
+ SOURCE_GPG=gnu-verified.gpg:$SOURCE2:VERIFIED_UPSTREAM_KEY
SOURCE2_IGNORE=signature
WEB_SITE=http://www.gnu.org/software/guile
ENTERED=20010922
- LICENSE[0]=GPL
+ LICENSE[0]=LGPL
KEYWORDS="devel"
SHORT="Portable, embeddable Scheme implementation"
cat << EOF
diff --git a/devel/guile/HISTORY b/devel/guile/HISTORY
index 693460f..b771e45 100644
--- a/devel/guile/HISTORY
+++ b/devel/guile/HISTORY
@@ -1,3 +1,10 @@
+2007-04-23 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS, DEPENDS: removed old 1.6 version, changed license to LGPL
+ * UP_TRIGGERS: correctly up_trigger instead of doing weird stuff
+ with sorcery internals
+ * DEPENDS: removed libtool
+ * BUILD, POST_REMOVE, PREPARE, PRE_BUILD, use-syntax.patch: removed
+
2007-03-03 Jeremy Blosser <jblosser-smgl AT firinn.org>
* POST_REMOVE: Replace bad TRACK_ROOT usage (automated).

diff --git a/devel/guile/POST_REMOVE b/devel/guile/POST_REMOVE
deleted file mode 100755
index 0309726..0000000
--- a/devel/guile/POST_REMOVE
+++ /dev/null
@@ -1 +0,0 @@
-rm -rf ${INSTALL_ROOT}/usr/share/guile
diff --git a/devel/guile/PREPARE b/devel/guile/PREPARE
deleted file mode 100755
index 4ca95c3..0000000
--- a/devel/guile/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query G_18 "Use guile 1.8?" n
diff --git a/devel/guile/PRE_BUILD b/devel/guile/PRE_BUILD
deleted file mode 100755
index b07515d..0000000
--- a/devel/guile/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-if [[ "$G_18" != "y" ]]
-then
- patch -p0 < $SPELL_DIRECTORY/use-syntax.patch
-fi
diff --git a/devel/guile/UP_TRIGGERS b/devel/guile/UP_TRIGGERS
index b644f5c..74d1d30 100755
--- a/devel/guile/UP_TRIGGERS
+++ b/devel/guile/UP_TRIGGERS
@@ -1,10 +1,7 @@
-if [ -z $(installed_version guile) ]
+local OLD_SPELL_VERSION=$(installed_version guile) || return 0
+if [[ ${OLD_SPELL_VERSION:0:3} == "1.6" && ${VERSION:0:3} == "1.8" ]]
then
- return 0
-fi &&
-
-local VE=$(installed_version guile)
-if [[ ${VE:0:3} = "1.6" && ${VERSION:0:3} == "1.8" ]]
-then
- RECAST_UP="guile"
+ for each in $(show_up_depends $SPELL); do
+ up_trigger $each cast_self
+ done
fi
diff --git a/devel/guile/use-syntax.patch b/devel/guile/use-syntax.patch
deleted file mode 100644
index 2ff93d5..0000000
--- a/devel/guile/use-syntax.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ice-9/boot-9.scm 2007/01/13 21:34:01 1.1
-+++ ice-9/boot-9.scm 2007/01/13 21:34:22
-@@ -1768,9 +1768,9 @@
- (let* ((interface-args (cadr kws))
- (interface (apply resolve-interface interface-args)))
- (and (eq? (car kws) #:use-syntax)
-- (or (symbol? (car interface-args))
-+ (or (symbol? (caar interface-args))
- (error "invalid module name for use-syntax"
-- interface-args))
-+ (car interface-args)))
- (set-module-transformer!
- module
- (module-ref interface (car
diff --git a/editors/texmacs/DETAILS b/editors/texmacs/DETAILS
index b6cfd3a..c35218a 100755
--- a/editors/texmacs/DETAILS
+++ b/editors/texmacs/DETAILS
@@ -1,13 +1,13 @@
SPELL=texmacs
- VERSION=1.0.6.8
+ VERSION=1.0.6.9
SOURCE=TeXmacs-${VERSION}-src.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/TeXmacs-${VERSION}-src
SOURCE_URL=ftp://ftp.texmacs.org/pub/TeXmacs/targz/${SOURCE}
SOURCE_GPG=gurus.gpg:${SOURCE}.sig
ENTERED=20010922
- UPDATED=20020305
LICENSE[0]=GPL
KEYWORDS="wysiwyg science editors"
+ WEB_SITE=http://www.texmacs.org
SHORT="WYSIWYG scientific text editor."
cat << EOF
GNU TeXmacs is a free WYSIWYG scientific text editor which was inspired
diff --git a/editors/texmacs/HISTORY b/editors/texmacs/HISTORY
index 4213881..c7f9851 100644
--- a/editors/texmacs/HISTORY
+++ b/editors/texmacs/HISTORY
@@ -1,3 +1,6 @@
+2007-05-11 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 1.0.6.9, added missing WEB_SITE
+
2007-01-18 Pieter Lenaerts <e-type AT sourcemage.org>
* DETAILS: updated to 1.0.6.8

diff --git a/editors/texmacs/TeXmacs-1.0.6.8-src.tar.gz.sig
b/editors/texmacs/TeXmacs-1.0.6.8-src.tar.gz.sig
deleted file mode 100644
index cd1d915..0000000
Binary files a/editors/texmacs/TeXmacs-1.0.6.8-src.tar.gz.sig and /dev/null
differ
diff --git a/editors/texmacs/TeXmacs-1.0.6.9-src.tar.gz.sig
b/editors/texmacs/TeXmacs-1.0.6.9-src.tar.gz.sig
new file mode 100644
index 0000000..775557c
Binary files /dev/null and b/editors/texmacs/TeXmacs-1.0.6.9-src.tar.gz.sig
differ
diff --git a/gnome1-apps/gnucash/BUILD b/gnome1-apps/gnucash/BUILD
index f8604bc..27ba77d 100755
--- a/gnome1-apps/gnucash/BUILD
+++ b/gnome1-apps/gnucash/BUILD
@@ -1,12 +1 @@
-if [ "$GNUCASH_SVN" == "n" ]; then
- if [ "$( installed_version db | cut -c1 )" == "4" ]
- then sedit "s/db-3/db-4/g" configure
- sedit "s/db-3/db-4/g" configure.in
- sedit "s/@DB_LIBS@/-ldb-4/" doc/Makefile.in
- else sedit "s/@DB_LIBS@/-ldb-3/" doc/Makefile.in
- fi
-fi &&
-
- OPTS="${OPTS} --disable-error-on-warning"
-
-default_build
+true
diff --git a/gnome1-apps/gnucash/CONFIGURE b/gnome1-apps/gnucash/CONFIGURE
deleted file mode 100755
index 55601be..0000000
--- a/gnome1-apps/gnucash/CONFIGURE
+++ /dev/null
@@ -1,16 +0,0 @@
-if [ -f /etc/sorcery/local/depends/guile.p ]
-then
- . /etc/sorcery/local/depends/guile.p
-fi
-
-if [ "$G_18" = "y" ]
-then
- message "\n${MESSAGE_COLOR}" \
- "${SPELL} isn't released for guile 1.8, so it may not works\n\n"
-
- if ! query "Would you like to continue?" n;
- then
- message "${MESSAGE_COLOR}Please recast later!\n"
- return 1
- fi
-fi
diff --git a/gnome1-apps/gnucash/CONFLICTS b/gnome1-apps/gnucash/CONFLICTS
deleted file mode 100755
index 3fac620..0000000
--- a/gnome1-apps/gnucash/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts gnucash y
diff --git a/gnome1-apps/gnucash/DEPENDS b/gnome1-apps/gnucash/DEPENDS
index 4baa528..ec6ce24 100755
--- a/gnome1-apps/gnucash/DEPENDS
+++ b/gnome1-apps/gnucash/DEPENDS
@@ -1,94 +1 @@
-if [ "$GNUCASH_SVN" == "y" ]; then
- depends subversion &&
- depends perl &&
- depends pkgconfig &&
- depends gtkhtml2 &&
- depends aqbanking &&
- depends texinfo &&
- depends guile &&
- depends goffice &&
- depends libgsf &&
- depends libart_lgpl &&
- depends libgnomeprint &&
-
- optional_depends bzip2 \
- "--with-bz2" \
- "--without-bz2" \
- "Build with BZip2 support" &&
-
- optional_depends libofx \
- "--enable-ofx" \
- "--disable-ofx" \
- "compile with ofx support?" &&
-
- optional_depends aqbanking \
- "--enable-hbci" \
- "--disable-hbci" \
- "Enable HBCI support" &&
-
- optional_depends SQL \
- "--enable-sql" \
- "--disable-sql" \
- "for SQL support" &&
-
- optional_depends doxygen \
- "--enable-doxygen" \
- "--disable-doxygen" \
- "enable documentation generation" &&
-
- optional_depends graphviz \
- "--enable-dot" \
- "--disable-dot" \
- "enable graphs in documentation" &&
-
- optional_depends gtk+2 \
- "--with-gtk" \
- "--without-gtk" \
- "Build without UI" &&
-
- optional_depends gnome-vfs2 \
- "--with-gnome" \
- "--without-gnome" \
- "Enable Gnome extension support" &&
-
- optional_depends libgnomeui \
- "--enable-gui" \
- "--disable-gui" \
- "Build with the GNOME GUI components"
-else
- depends gnome-libs &&
- depends glade &&
- depends guppi &&
- depends slib &&
- depends gtkhtml &&
- depends libghttp &&
-
- optional_depends doxygen \
- "--enable-doxygen --enable-html-docs" \
- "" \
- "enable documentation generation" &&
-
- optional_depends gnome-print \
- "" \
- "" \
- "for GNOME printing architecture" &&
-
- optional_depends libofx \
- "" \
- "" \
- "to support Open Financial Exchange data"
-
-fi &&
-
-depends libtool &&
-depends libxml2 &&
-depends g-wrap &&
-
-optional_depends finance-quote \
- "" \
- "" \
- "for stock price quotes and currency exchange rates"
-
-
-
-
+depends gnucash2
diff --git a/gnome1-apps/gnucash/DETAILS b/gnome1-apps/gnucash/DETAILS
index 085d6ee..935ce14 100755
--- a/gnome1-apps/gnucash/DETAILS
+++ b/gnome1-apps/gnucash/DETAILS
@@ -1,23 +1,11 @@
SPELL=gnucash
-if [ "$GNUCASH_SVN" == "y" ]; then
- if [ "$GNUCASH_SVN_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
- SOURCE=$SPELL-svn.tar.bz2
- SOURCE_URL[0]=svn_http://svn.gnucash.org/repo/gnucash/trunk:${SPELL}-svn
- FORCE_DOWNLOAD="on"
- SOURCE_IGNORE=volatile
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
-else
VERSION=1.8.12
- SOURCE=$SPELL-$VERSION.tar.gz
-
SOURCE_URL[0]=http://www.gnucash.org/pub/gnucash/sources/stable/${SOURCE/bz2/gz}
- SOURCE_URL[1]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-fi
+# SOURCE=$SPELL-$VERSION.tar.gz
+#
SOURCE_URL[0]=http://www.gnucash.org/pub/gnucash/sources/stable/${SOURCE/bz2/gz}
+# SOURCE_URL[1]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ PATCHLEVEL=1
WEB_SITE=http://www.gnucash.org
ENTERED=20011105
UPDATED=20040830
diff --git a/gnome1-apps/gnucash/HISTORY b/gnome1-apps/gnucash/HISTORY
index 8635fd3..8cfb153 100644
--- a/gnome1-apps/gnucash/HISTORY
+++ b/gnome1-apps/gnucash/HISTORY
@@ -1,3 +1,6 @@
+2007-05-10 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * all: deprecated in favour of gnucash2
+
2006-10-11 Maurizio Boriani <baux AT sourcemage.org>
* CONFIGURE: Add warning about guile major update.

diff --git a/gnome1-apps/gnucash/INSTALL b/gnome1-apps/gnucash/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome1-apps/gnucash/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/gnome1-apps/gnucash/PREPARE b/gnome1-apps/gnucash/PREPARE
deleted file mode 100755
index d875ba0..0000000
--- a/gnome1-apps/gnucash/PREPARE
+++ /dev/null
@@ -1,6 +0,0 @@
-config_query GNUCASH_SVN "Use SVN for GNOME2 gnucash?" n &&
-
-if [ "$GNUCASH_SVN" == "y" ]; then
- config_query GNUCASH_SVN_AUTOUPDATE \
- "Update to latest SVN automatically on system updates?" n
-fi
diff --git a/gnome1-apps/gnucash/PRE_BUILD b/gnome1-apps/gnucash/PRE_BUILD
index 64a27c1..27ba77d 100755
--- a/gnome1-apps/gnucash/PRE_BUILD
+++ b/gnome1-apps/gnucash/PRE_BUILD
@@ -1,6 +1 @@
-default_pre_build &&
-
-if [ "$GNUCASH_SVN" == "y" ]; then
- cd $SOURCE_DIRECTORY &&
- NOCONFIGURE="ON" ./autogen.sh
-fi
+true
diff --git a/gnome1-apps/gnucash/TRIGGERS b/gnome1-apps/gnucash/TRIGGERS
new file mode 100755
index 0000000..39061ed
--- /dev/null
+++ b/gnome1-apps/gnucash/TRIGGERS
@@ -0,0 +1 @@
+on_cast gnucash dispel_self
diff --git a/gnome1-apps/gnucash/gnucash-1.8.12.tar.gz.sig
b/gnome1-apps/gnucash/gnucash-1.8.12.tar.gz.sig
deleted file mode 100644
index f7062a3..0000000
Binary files a/gnome1-apps/gnucash/gnucash-1.8.12.tar.gz.sig and /dev/null
differ
diff --git a/gnome1-apps/gnumeric/BUILD b/gnome1-apps/gnumeric/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome1-apps/gnumeric/BUILD
@@ -0,0 +1 @@
+true
diff --git a/gnome1-apps/gnumeric/CONFIGURE b/gnome1-apps/gnumeric/CONFIGURE
deleted file mode 100755
index 55601be..0000000
--- a/gnome1-apps/gnumeric/CONFIGURE
+++ /dev/null
@@ -1,16 +0,0 @@
-if [ -f /etc/sorcery/local/depends/guile.p ]
-then
- . /etc/sorcery/local/depends/guile.p
-fi
-
-if [ "$G_18" = "y" ]
-then
- message "\n${MESSAGE_COLOR}" \
- "${SPELL} isn't released for guile 1.8, so it may not works\n\n"
-
- if ! query "Would you like to continue?" n;
- then
- message "${MESSAGE_COLOR}Please recast later!\n"
- return 1
- fi
-fi
diff --git a/gnome1-apps/gnumeric/DEPENDS b/gnome1-apps/gnumeric/DEPENDS
index 07d6f07..9ff4de1 100755
--- a/gnome1-apps/gnumeric/DEPENDS
+++ b/gnome1-apps/gnumeric/DEPENDS
@@ -1,23 +1 @@
-depends libxml &&
-depends libglade &&
-depends glib &&
-depends gtk+ &&
-depends gnome-print &&
-depends libole2 &&
-depends gal &&
-depends bonobo &&
-depends libgda
-
-# Add Guile when Guile >= 1.5
-# depends guile
-
-# Does it depend on gnome-core ?
-
-optional_depends gtk+extra "" "" "Add gtk+extra graphing support" &&
-
-optional_depends "evolution" \
- "--with-evolution" \
- "--without-evolution" \
- "to send spreadsheats with Evolution"
-
-
+depends gnumeric2
diff --git a/gnome1-apps/gnumeric/DETAILS b/gnome1-apps/gnumeric/DETAILS
index 1ca3cfd..91e2250 100755
--- a/gnome1-apps/gnumeric/DETAILS
+++ b/gnome1-apps/gnumeric/DETAILS
@@ -1,12 +1,13 @@
SPELL=gnumeric
VERSION=1.0.13
- BRANCH=`echo $VERSION|cut -d . -f 1,2`
- SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
- SOURCE_URL[1]=ftp://ftp.gnome.org/pub/GNOME/sources/$SPELL/$BRANCH/$SOURCE
-
SOURCE_HASH=sha512:7540c9d3cf55121d3104a635db2336b45ac07b373d656bc8d72c4e0d7ebf575fabf7c27fd115a993fb62a9cb305d4f74eecb3a03a592b22b0a6528629e632f51
+# BRANCH=`echo $VERSION|cut -d . -f 1,2`
+# SOURCE=$SPELL-$VERSION.tar.bz2
+#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+# SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
+#
SOURCE_URL[1]=ftp://ftp.gnome.org/pub/GNOME/sources/$SPELL/$BRANCH/$SOURCE
+#
SOURCE_HASH=sha512:7540c9d3cf55121d3104a635db2336b45ac07b373d656bc8d72c4e0d7ebf575fabf7c27fd115a993fb62a9cb305d4f74eecb3a03a592b22b0a6528629e632f51
LICENSE[0]=GPL
+ PATCHLEVEL=1
WEB_SITE=http://www.gnumeric.org
ENTERED=20011009
UPDATED=20030412
diff --git a/gnome1-apps/gnumeric/HISTORY b/gnome1-apps/gnumeric/HISTORY
index 8ccedd1..f2a18de 100644
--- a/gnome1-apps/gnumeric/HISTORY
+++ b/gnome1-apps/gnumeric/HISTORY
@@ -1,3 +1,6 @@
+2007-05-10 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * all: deprecated in favor of gnumeric2
+
2006-10-11 Maurizio Boriani <baux AT sourcemage.org>
* CONFIGURE: Add warning about guile major update.

diff --git a/gnome1-apps/gnumeric/INSTALL b/gnome1-apps/gnumeric/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome1-apps/gnumeric/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/gnome1-apps/gnumeric/PRE_BUILD b/gnome1-apps/gnumeric/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome1-apps/gnumeric/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/gnome1-apps/gnumeric/TRIGGERS b/gnome1-apps/gnumeric/TRIGGERS
new file mode 100755
index 0000000..c7028a5
--- /dev/null
+++ b/gnome1-apps/gnumeric/TRIGGERS
@@ -0,0 +1 @@
+on_cast gnumeric dispel_self
diff --git a/gnome1-libs/gnome-games/BUILD b/gnome1-libs/gnome-games/BUILD
index 5614b36..27ba77d 100755
--- a/gnome1-libs/gnome-games/BUILD
+++ b/gnome1-libs/gnome-games/BUILD
@@ -1,12 +1 @@
-(
-
- export CFLAGS="$CFLAGS -I/usr/include/gdk-pixbuf-1.0"
-
- ./configure --prefix=${INSTALL_ROOT}/usr \
- --bindir=${INSTALL_ROOT}/usr/games \
- --sysconfdir=${INSTALL_ROOT}/etc &&
- make &&
- prepare_install &&
- make install
-
-) > $C_FIFO 2>&1
+true
diff --git a/gnome1-libs/gnome-games/CONFIGURE
b/gnome1-libs/gnome-games/CONFIGURE
deleted file mode 100755
index 55601be..0000000
--- a/gnome1-libs/gnome-games/CONFIGURE
+++ /dev/null
@@ -1,16 +0,0 @@
-if [ -f /etc/sorcery/local/depends/guile.p ]
-then
- . /etc/sorcery/local/depends/guile.p
-fi
-
-if [ "$G_18" = "y" ]
-then
- message "\n${MESSAGE_COLOR}" \
- "${SPELL} isn't released for guile 1.8, so it may not works\n\n"
-
- if ! query "Would you like to continue?" n;
- then
- message "${MESSAGE_COLOR}Please recast later!\n"
- return 1
- fi
-fi
diff --git a/gnome1-libs/gnome-games/CONFLICTS
b/gnome1-libs/gnome-games/CONFLICTS
deleted file mode 100755
index 3f57442..0000000
--- a/gnome1-libs/gnome-games/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts gnome-games2
diff --git a/gnome1-libs/gnome-games/DEPENDS b/gnome1-libs/gnome-games/DEPENDS
index 8d18966..233b007 100755
--- a/gnome1-libs/gnome-games/DEPENDS
+++ b/gnome1-libs/gnome-games/DEPENDS
@@ -1,5 +1 @@
-depends gnome-libs &&
-depends gdk-pixbuf &&
-depends scrollkeeper
-
-optional_depends "guile" "" "" "for the AisleRiot card game"
+depends gnome-games2
diff --git a/gnome1-libs/gnome-games/DETAILS b/gnome1-libs/gnome-games/DETAILS
index 6c802e2..cf5177f 100755
--- a/gnome1-libs/gnome-games/DETAILS
+++ b/gnome1-libs/gnome-games/DETAILS
@@ -1,17 +1,18 @@
SPELL=gnome-games
VERSION=1.4.0.4
BRANCH=`echo $VERSION|cut -d . -f 1,2`
- SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
- SOURCE_URL[1]=ftp://ftp.gnome.org/pub/GNOME/sources/$SPELL/$BRANCH/$SOURCE
-
SOURCE_HASH=sha512:39eb862fdb26274d66d0040e9969e484e70ab251221387f0f6f72b514be5e04f5dbb290a3acb6106805e4f80159607a5dcf6fec48b537b469cf7ed29b809d33e
+# SOURCE=$SPELL-$VERSION.tar.bz2
+#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+# SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
+#
SOURCE_URL[1]=ftp://ftp.gnome.org/pub/GNOME/sources/$SPELL/$BRANCH/$SOURCE
+#
SOURCE_HASH=sha512:39eb862fdb26274d66d0040e9969e484e70ab251221387f0f6f72b514be5e04f5dbb290a3acb6106805e4f80159607a5dcf6fec48b537b469cf7ed29b809d33e
+PATCHLEVEL=1
WEB_SITE=http://www.gnome.org
LICENSE[0]=GPL
LICENSE[1]=FDL
ENTERED=20010922
KEYWORDS="games gnome1 libs"
- BUILD_API=1
+
SHORT="gnome-games is a collection of games for gnome."
cat << EOF
gnome-games is a collection of games for gnome.
diff --git a/gnome1-libs/gnome-games/HISTORY b/gnome1-libs/gnome-games/HISTORY
index 64cdcd3..1317a30 100644
--- a/gnome1-libs/gnome-games/HISTORY
+++ b/gnome1-libs/gnome-games/HISTORY
@@ -1,3 +1,6 @@
+2007-05-10 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * all: deprecated in favor of gnome-games2
+
2006-10-11 Maurizio Boriani <baux AT sourcemage.org>
* CONFIGURE: Add warning about guile major update.

diff --git a/gnome1-libs/gnome-games/INSTALL b/gnome1-libs/gnome-games/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome1-libs/gnome-games/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/gnome1-libs/gnome-games/PRE_BUILD
b/gnome1-libs/gnome-games/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome1-libs/gnome-games/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/gnome1-libs/gnome-games/TRIGGERS
b/gnome1-libs/gnome-games/TRIGGERS
new file mode 100755
index 0000000..0a8468a
--- /dev/null
+++ b/gnome1-libs/gnome-games/TRIGGERS
@@ -0,0 +1 @@
+on_cast gnome-games dispel_self
diff --git a/gnome1-libs/gnome-karubik-profile/BUILD
b/gnome1-libs/gnome-karubik-profile/BUILD
index b75eac3..27ba77d 100755
--- a/gnome1-libs/gnome-karubik-profile/BUILD
+++ b/gnome1-libs/gnome-karubik-profile/BUILD
@@ -1 +1 @@
-echo > $C_FIFO
+true
diff --git a/gnome1-libs/gnome-karubik-profile/DEPENDS
b/gnome1-libs/gnome-karubik-profile/DEPENDS
index c045c32..11915f6 100755
--- a/gnome1-libs/gnome-karubik-profile/DEPENDS
+++ b/gnome1-libs/gnome-karubik-profile/DEPENDS
@@ -1,68 +1 @@
-depends X11-LIBS &&
-depends glib &&
-depends gtk+ &&
-depends libsigc++ &&
-depends gtkmm &&
-depends imlib &&
-depends gtk-engines &&
-depends libxml &&
-depends libghttp &&
-depends libproplist &&
-depends orbit &&
-depends audiofile &&
-depends esound &&
-depends gnome-libs &&
-depends gnomemm &&
-depends oaf &&
-depends gdk-pixbuf &&
-depends gnome-print &&
-depends bonobo &&
-depends libgtop &&
-depends libglade &&
-depends gconf &&
-depends gnome-vfs &&
-depends control-center &&
-depends scrollkeeper &&
-depends gnome-core &&
-depends gnome-applets &&
-depends gnome-python &&
-depends gnome-utils &&
-depends gnome-audio &&
-depends gnome-games &&
-depends gnome-media &&
-depends gnome-pim &&
-depends bug-buddy &&
-depends gdm &&
-depends ggv &&
-depends ghex &&
-depends gtop &&
-depends panelmm &&
-depends librep &&
-depends rep-gtk &&
-depends sawfish &&
-depends windowmaker &&
-depends xalf &&
-depends gnome-user-docs &&
-depends glade &&
-depends guppi &&
-depends pspell &&
-depends balsa &&
-depends libxslt &&
-depends libole2 &&
-depends libunicode &&
-depends gal &&
-depends gnumeric &&
-depends freetype2 &&
-depends mozilla &&
-depends librsvg &&
-depends eel &&
-# depends ammonite &&
-depends nautilus &&
-depends galeon &&
-depends db &&
-depends bonobo-conf &&
-depends gtkhtml &&
-depends pilot-link &&
-# depends gnome-pilot &&
-# depends gnome-pilot-conduits &&
-depends evolution
+depends gnome2-profile
diff --git a/gnome1-libs/gnome-karubik-profile/DETAILS
b/gnome1-libs/gnome-karubik-profile/DETAILS
index 37e3366..fb20486 100755
--- a/gnome1-libs/gnome-karubik-profile/DETAILS
+++ b/gnome1-libs/gnome-karubik-profile/DETAILS
@@ -1,9 +1,10 @@
SPELL=gnome-karubik-profile
VERSION=1.4
+PATCHLEVEL=1
WEB_SITE=http://www.gnome.org
ENTERED=20011122
KEYWORDS="gnome1 libs"
- BUILD_API=1
+
SHORT="gnome-karubik is an alternate GNOME profile."
cat << EOF

diff --git a/gnome1-libs/gnome-karubik-profile/HISTORY
b/gnome1-libs/gnome-karubik-profile/HISTORY
index a4f6ae7..176825a 100644
--- a/gnome1-libs/gnome-karubik-profile/HISTORY
+++ b/gnome1-libs/gnome-karubik-profile/HISTORY
@@ -1,3 +1,6 @@
+2007-05-10 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * all: deprecated in favor of gnome2-profile
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/gnome1-libs/gnome-karubik-profile/INSTALL
b/gnome1-libs/gnome-karubik-profile/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome1-libs/gnome-karubik-profile/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/gnome1-libs/gnome-karubik-profile/POST_BUILD
b/gnome1-libs/gnome-karubik-profile/POST_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome1-libs/gnome-karubik-profile/POST_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome1-libs/gnome-karubik-profile/TRIGGERS
b/gnome1-libs/gnome-karubik-profile/TRIGGERS
new file mode 100755
index 0000000..d1a5e15
--- /dev/null
+++ b/gnome1-libs/gnome-karubik-profile/TRIGGERS
@@ -0,0 +1 @@
+on_cast gnome-karubik-profile dispel_self
diff --git a/gnome1-libs/gnome-utils/BUILD b/gnome1-libs/gnome-utils/BUILD
index c59db19..27ba77d 100755
--- a/gnome1-libs/gnome-utils/BUILD
+++ b/gnome1-libs/gnome-utils/BUILD
@@ -1,12 +1 @@
-(
-
- ./configure --prefix=${INSTALL_ROOT}/usr \
- --sysconfdir=${INSTALL_ROOT}/etc \
- --localstatedir=${INSTALL_ROOT}/var \
- --with-messages=${INSTALL_ROOT}/var/log/messages \
- $OPTS &&
- make &&
- prepare_install &&
- make install
-
-) > $C_FIFO 2>&1
+true
diff --git a/gnome1-libs/gnome-utils/CONFIGURE
b/gnome1-libs/gnome-utils/CONFIGURE
deleted file mode 100755
index 55601be..0000000
--- a/gnome1-libs/gnome-utils/CONFIGURE
+++ /dev/null
@@ -1,16 +0,0 @@
-if [ -f /etc/sorcery/local/depends/guile.p ]
-then
- . /etc/sorcery/local/depends/guile.p
-fi
-
-if [ "$G_18" = "y" ]
-then
- message "\n${MESSAGE_COLOR}" \
- "${SPELL} isn't released for guile 1.8, so it may not works\n\n"
-
- if ! query "Would you like to continue?" n;
- then
- message "${MESSAGE_COLOR}Please recast later!\n"
- return 1
- fi
-fi
diff --git a/gnome1-libs/gnome-utils/CONFLICTS
b/gnome1-libs/gnome-utils/CONFLICTS
deleted file mode 100755
index 3dff696..0000000
--- a/gnome1-libs/gnome-utils/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts gnome-utils2
diff --git a/gnome1-libs/gnome-utils/DEPENDS b/gnome1-libs/gnome-utils/DEPENDS
index b8fb822..e8182f3 100755
--- a/gnome1-libs/gnome-utils/DEPENDS
+++ b/gnome1-libs/gnome-utils/DEPENDS
@@ -1,7 +1 @@
-depends gnome-libs &&
-depends libglade &&
-depends glade &&
-depends libgtop &&
-depends gnome-core &&
-depends xml-i18n-tools &&
-depends guile
+depends gnome-utils2
diff --git a/gnome1-libs/gnome-utils/DETAILS b/gnome1-libs/gnome-utils/DETAILS
index 6ee0b25..43d122a 100755
--- a/gnome1-libs/gnome-utils/DETAILS
+++ b/gnome1-libs/gnome-utils/DETAILS
@@ -1,17 +1,18 @@
SPELL=gnome-utils
VERSION=1.4.1.3
BRANCH=`echo $VERSION|cut -d . -f 1,2`
- SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
- SOURCE_URL[1]=ftp://ftp.gnome.org/pub/GNOME/sources/$SPELL/$BRANCH/$SOURCE
-
SOURCE_HASH=sha512:acbc820818c819308705504dabb79a08ea976e87d9479d16aeff7da32db9c587e60cd772a2971b096064fd8b95f2a291c9c4b9256d2d6d60eb920dd2706b47f3
+# SOURCE=$SPELL-$VERSION.tar.bz2
+#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+# SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
+#
SOURCE_URL[1]=ftp://ftp.gnome.org/pub/GNOME/sources/$SPELL/$BRANCH/$SOURCE
+#
SOURCE_HASH=sha512:acbc820818c819308705504dabb79a08ea976e87d9479d16aeff7da32db9c587e60cd772a2971b096064fd8b95f2a291c9c4b9256d2d6d60eb920dd2706b47f3
+PATCHLEVEL=1
WEB_SITE=http://www.gnome.org
LICENSE[0]=GPL
ENTERED=20010922
UPDATED=20030212
KEYWORDS="gnome1 libs"
- BUILD_API=1
+
SHORT="gnome-utils provides useful gnome based utilities."
cat << EOF
Gnome is the "GNU Network Object Model Environment". It is a project to

diff --git a/gnome1-libs/gnome-utils/HISTORY b/gnome1-libs/gnome-utils/HISTORY
index 764129c..04358d1 100644
--- a/gnome1-libs/gnome-utils/HISTORY
+++ b/gnome1-libs/gnome-utils/HISTORY
@@ -1,3 +1,6 @@
+2007-05-10 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * all: deprecated in favor of gnome-utils2
+
2006-10-11 Maurizio Boriani <baux AT sourcemage.org>
* CONFIGURE: Add warning about guile major update.

diff --git a/gnome1-libs/gnome-utils/INSTALL b/gnome1-libs/gnome-utils/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome1-libs/gnome-utils/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/gnome1-libs/gnome-utils/PRE_BUILD
b/gnome1-libs/gnome-utils/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome1-libs/gnome-utils/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/gnome1-libs/gnome-utils/TRIGGERS
b/gnome1-libs/gnome-utils/TRIGGERS
new file mode 100755
index 0000000..97ebdf9
--- /dev/null
+++ b/gnome1-libs/gnome-utils/TRIGGERS
@@ -0,0 +1 @@
+on_cast gnome-utils dispel_self
diff --git a/gnome1-libs/guppi/BUILD b/gnome1-libs/guppi/BUILD
index 4e5d92d..27ba77d 100755
--- a/gnome1-libs/guppi/BUILD
+++ b/gnome1-libs/guppi/BUILD
@@ -1,2 +1 @@
-patch -p0 < $SCRIPT_DIRECTORY/gcc341.diff &&
-default_build
+true
diff --git a/gnome1-libs/guppi/CONFIGURE b/gnome1-libs/guppi/CONFIGURE
deleted file mode 100755
index 55601be..0000000
--- a/gnome1-libs/guppi/CONFIGURE
+++ /dev/null
@@ -1,16 +0,0 @@
-if [ -f /etc/sorcery/local/depends/guile.p ]
-then
- . /etc/sorcery/local/depends/guile.p
-fi
-
-if [ "$G_18" = "y" ]
-then
- message "\n${MESSAGE_COLOR}" \
- "${SPELL} isn't released for guile 1.8, so it may not works\n\n"
-
- if ! query "Would you like to continue?" n;
- then
- message "${MESSAGE_COLOR}Please recast later!\n"
- return 1
- fi
-fi
diff --git a/gnome1-libs/guppi/DEPENDS b/gnome1-libs/guppi/DEPENDS
deleted file mode 100755
index 914ba61..0000000
--- a/gnome1-libs/guppi/DEPENDS
+++ /dev/null
@@ -1,15 +0,0 @@
-depends gcc34 &&
-depends gnome-libs &&
-depends bonobo &&
-depends guile &&
-depends libglade &&
-
-optional_depends python \
- "" \
- "" \
- "to enable python scripting" &&
-
-optional_depends gnumeric \
- "" \
- "" \
- "to add graphing support in gnumeric"
diff --git a/gnome1-libs/guppi/DETAILS b/gnome1-libs/guppi/DETAILS
index 17c1c3c..b067686 100755
--- a/gnome1-libs/guppi/DETAILS
+++ b/gnome1-libs/guppi/DETAILS
@@ -1,11 +1,12 @@
SPELL=guppi
VERSION=0.40.3
BRANCH=`echo $VERSION|cut -d . -f 1,2`
- SOURCE=Guppi-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/Guppi-$VERSION
- SOURCE_URL[0]=$GNOME_URL/sources/Guppi/$BRANCH/$SOURCE
- SOURCE_URL[1]=ftp://ftp.gnome.org/pub/GNOME/sources/Guppi/$BRANCH/$SOURCE
-
SOURCE_HASH=sha512:cfeabc6554ac06586dc6c72f77637812279040d6408c5643f6ab93aad03cdecbff6d52ca7d4f4be59568dddefa5cff418edda3f30e8023a7ec768b54589cb630
+# SOURCE=Guppi-$VERSION.tar.bz2
+#SOURCE_DIRECTORY=$BUILD_DIRECTORY/Guppi-$VERSION
+# SOURCE_URL[0]=$GNOME_URL/sources/Guppi/$BRANCH/$SOURCE
+# SOURCE_URL[1]=ftp://ftp.gnome.org/pub/GNOME/sources/Guppi/$BRANCH/$SOURCE
+#
SOURCE_HASH=sha512:cfeabc6554ac06586dc6c72f77637812279040d6408c5643f6ab93aad03cdecbff6d52ca7d4f4be59568dddefa5cff418edda3f30e8023a7ec768b54589cb630
+PATCHLEVEL=1
WEB_SITE=http://www.gnome.org/projects/Guppi
ENTERED=20011022
UPDATED=20020124
diff --git a/gnome1-libs/guppi/HISTORY b/gnome1-libs/guppi/HISTORY
index 136ad44..edda4b2 100644
--- a/gnome1-libs/guppi/HISTORY
+++ b/gnome1-libs/guppi/HISTORY
@@ -1,3 +1,6 @@
+2007-05-10 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * all: deprecated, upstream unmaintained and spell unused
+
2006-10-11 Maurizio Boriani <baux AT sourcemage.org>
* CONFIGURE: Add warning about guile major update.

diff --git a/gnome1-libs/guppi/INSTALL b/gnome1-libs/guppi/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome1-libs/guppi/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/gnome1-libs/guppi/PRE_BUILD b/gnome1-libs/guppi/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome1-libs/guppi/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/gnome1-libs/guppi/TRIGGERS b/gnome1-libs/guppi/TRIGGERS
new file mode 100755
index 0000000..d62de40
--- /dev/null
+++ b/gnome1-libs/guppi/TRIGGERS
@@ -0,0 +1 @@
+on_cast guppi dispel_self
diff --git a/gnome1-libs/guppi/gcc341.diff b/gnome1-libs/guppi/gcc341.diff
deleted file mode 100644
index bf61536..0000000
--- a/gnome1-libs/guppi/gcc341.diff
+++ /dev/null
@@ -1,76 +0,0 @@
---- src/libguppiplot/guppi-layout-constraint.c.orig 2004-07-22
10:10:45.481338456 +0100
-+++ src/libguppiplot/guppi-layout-constraint.c 2004-07-22 10:11:05.595280672
+0100
-@@ -165,6 +165,7 @@
-
- default:
- /* Fall through, do nothing. */
-+ ;;
- }
-
- ti = term_info_new (type, factor, geom);
---- src/libguppiplot/guppi-text-block.c.orig 2004-07-22 10:09:43.993686000
+0100
-+++ src/libguppiplot/guppi-text-block.c 2004-07-22 10:10:13.209244560
+0100
-@@ -900,6 +900,7 @@
-
- default:
- /* Do nothing. */
-+ ;;
- }
-
- render_stack_evolve (stack, tt);
---- src/libguppiplot/guppi-root-group-item.c.orig 2004-07-22
10:11:45.379232592 +0100
-+++ src/libguppiplot/guppi-root-group-item.c 2004-07-22 10:12:23.891377856
+0100
-@@ -548,6 +548,7 @@
- return motion_notify_event (root, &(ev->motion));
-
- default:
-+ ;;
- }
-
- return FALSE;
-@@ -777,6 +778,7 @@
- case ROOT_GROUP_RESIZE_NONE:
- default:
- /* insure we do nothing */
-+ ;;
- }
-
- if (please_resize_canvas)
---- src/libguppiplot/guppi-view-interval.c.orig 2004-07-22
10:07:20.323527184 +0100
-+++ src/libguppiplot/guppi-view-interval.c 2004-07-22 10:09:05.293569312
+0100
-@@ -227,6 +227,7 @@
- #endif
-
- default:
-+ ;;
- }
-
- return TRUE;
---- src/demo.c.orig 2004-07-22 10:14:39.986688224 +0100
-+++ src/demo.c 2004-07-22 10:14:53.046702800 +0100
-@@ -451,6 +451,7 @@
- compass_pos = GUPPI_NORTH;
- break;
- default:
-+ ;;
- }
-
- guppi_element_state_set (state,
---- libguppitank/guppi-object-barchart.c.orig 2004-07-22 10:16:50.599832008
+0100
-+++ libguppitank/guppi-object-barchart.c 2004-07-22 10:17:37.104762184
+0100
-@@ -701,6 +701,7 @@
- break;
-
- default:
-+ ;;
- }
- }
-
-@@ -733,6 +734,7 @@
- break;
-
- default:
-+ ;;
- }
- }
-
diff --git a/gnome2-apps/gnucash2/CONFIGURE b/gnome2-apps/gnucash2/CONFIGURE
deleted file mode 100755
index 55601be..0000000
--- a/gnome2-apps/gnucash2/CONFIGURE
+++ /dev/null
@@ -1,16 +0,0 @@
-if [ -f /etc/sorcery/local/depends/guile.p ]
-then
- . /etc/sorcery/local/depends/guile.p
-fi
-
-if [ "$G_18" = "y" ]
-then
- message "\n${MESSAGE_COLOR}" \
- "${SPELL} isn't released for guile 1.8, so it may not works\n\n"
-
- if ! query "Would you like to continue?" n;
- then
- message "${MESSAGE_COLOR}Please recast later!\n"
- return 1
- fi
-fi
diff --git a/gnome2-apps/gnucash2/DEPENDS b/gnome2-apps/gnucash2/DEPENDS
index 801177b..00e6021 100755
--- a/gnome2-apps/gnucash2/DEPENDS
+++ b/gnome2-apps/gnucash2/DEPENDS
@@ -37,10 +37,12 @@ optional_depends doxygen \
'--disable-doxygen' \
'to enable documentation generation' &&

+if is_depends_enabled $SPELL doxygen; then
optional_depends graphviz \
'--enable-dot' \
'--disable-dot' \
- 'to enable graphs in documentation' &&
+ 'to enable graphs in documentation'
+fi &&

optional_depends gtk+2 \
'--with-gtk' \
diff --git a/gnome2-apps/gnucash2/HISTORY b/gnome2-apps/gnucash2/HISTORY
index 32dede4..cc3d544 100644
--- a/gnome2-apps/gnucash2/HISTORY
+++ b/gnome2-apps/gnucash2/HISTORY
@@ -1,3 +1,10 @@
+2007-05-09 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, configure-fix.diff: fixed compile with current
+ goffice-dev
+ * DEPENDS: only optional_depend on graphviz if doxygen is enabled,
+ otherwise breaks on systems without doxygen but with graphviz
+ * CONFIGURE: removed guile version warning
+
2007-04-29 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 2.1.1
* DEPENDS: Removed g-wrap. According to upstream not required
diff --git a/gnome2-apps/gnucash2/PRE_BUILD b/gnome2-apps/gnucash2/PRE_BUILD
new file mode 100755
index 0000000..21ff08d
--- /dev/null
+++ b/gnome2-apps/gnucash2/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/configure-fix.diff
diff --git a/gnome2-apps/gnucash2/configure-fix.diff
b/gnome2-apps/gnucash2/configure-fix.diff
new file mode 100644
index 0000000..5a89d72
--- /dev/null
+++ b/gnome2-apps/gnucash2/configure-fix.diff
@@ -0,0 +1,40 @@
+--- configure~ 2007-04-29 01:16:11.000000000 +0200
++++ configure 2007-05-08 21:55:20.000000000 +0200
+@@ -29816,23 +29816,23 @@
+ else
+ pkg_config_min_version=0.9.0
+ if $PKG_CONFIG --atleast-pkgconfig-version $pkg_config_min_version;
then
+- { echo "$as_me:$LINENO: checking for libgoffice-0.3 >= 0.3.0" >&5
+-echo $ECHO_N "checking for libgoffice-0.3 >= 0.3.0... $ECHO_C" >&6; }
++ { echo "$as_me:$LINENO: checking for libgoffice-0.4 >= 0.3.0" >&5
++echo $ECHO_N "checking for libgoffice-0.4 >= 0.3.0... $ECHO_C" >&6; }
+
+- if $PKG_CONFIG --silence-errors --exists "libgoffice-0.3 >= 0.3.0"
; then
++ if $PKG_CONFIG --silence-errors --exists "libgoffice-0.4 >= 0.3.0"
; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+ succeeded=yes
+
+ { echo "$as_me:$LINENO: checking GOFFICE_CFLAGS" >&5
+ echo $ECHO_N "checking GOFFICE_CFLAGS... $ECHO_C" >&6; }
+- GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.3 >= 0.3.0"`
++ GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.4 >= 0.3.0"`
+ { echo "$as_me:$LINENO: result: $GOFFICE_CFLAGS" >&5
+ echo "${ECHO_T}$GOFFICE_CFLAGS" >&6; }
+
+ { echo "$as_me:$LINENO: checking GOFFICE_LIBS" >&5
+ echo $ECHO_N "checking GOFFICE_LIBS... $ECHO_C" >&6; }
+- GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.3 >= 0.3.0"`
++ GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.4 >= 0.3.0"`
+ { echo "$as_me:$LINENO: result: $GOFFICE_LIBS" >&5
+ echo "${ECHO_T}$GOFFICE_LIBS" >&6; }
+ else
+@@ -29842,7 +29842,7 @@
+ GOFFICE_LIBS=""
+ ## If we have a custom action on failure, don't print errors,
but
+ ## do set a variable so people can do so.
+- GOFFICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout
--print-errors "libgoffice-0.3 >= 0.3.0" 2>&1`
++ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout
--print-errors "libgoffice-0.4 >= 0.3.0" 2>&1`
+
+ fi
+
diff --git a/gnome2-apps/gnumeric2/CONFIGURE b/gnome2-apps/gnumeric2/CONFIGURE
index bf69b89..165040e 100755
--- a/gnome2-apps/gnumeric2/CONFIGURE
+++ b/gnome2-apps/gnumeric2/CONFIGURE
@@ -1,19 +1,3 @@
-if [ -f /etc/sorcery/local/depends/guile.p ]
-then
- . /etc/sorcery/local/depends/guile.p
-fi
-
-if [ "$G_18" = "y" ]
-then
- message "\n${MESSAGE_COLOR}" \
- "${SPELL} isn't released for guile 1.8, so it may not works\n\n"
-
- if ! query "Would you like to continue?" n;
- then
- message "${MESSAGE_COLOR}Please recast later!\n"
- return 1
- fi
-fi
config_query SSCONVERT "Build ssconvert (cmd line sreadsheet conversion
tool)?" y &&
config_query SSINDEX "Build ssindex (spreadsheet indexer for beagle)?" n
&&
config_query SOLVER "Compile the solver?" y
&&
diff --git a/gnome2-apps/gnumeric2/DEPENDS b/gnome2-apps/gnumeric2/DEPENDS
index c9d0289..bcb2d3a 100755
--- a/gnome2-apps/gnumeric2/DEPENDS
+++ b/gnome2-apps/gnumeric2/DEPENDS
@@ -39,9 +39,4 @@ optional_depends libgnomedb-dev \
optional_depends python \
"--with-python" \
"--without-python" \
- "Compile the Python plugin loader?" &&
-
-optional_depends guile \
- "--with-guile" \
- "--without-guile" \
- "for guile support"
+ "Compile the Python plugin loader?"
diff --git a/gnome2-apps/gnumeric2/HISTORY b/gnome2-apps/gnumeric2/HISTORY
index 5c44a25..92d2213 100644
--- a/gnome2-apps/gnumeric2/HISTORY
+++ b/gnome2-apps/gnumeric2/HISTORY
@@ -1,6 +1,10 @@
2007-05-03 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.7.10

+2007-04-24 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFIGURE: removed guile warning
+ * DEPENDS: removed optional_depends on guile, not supported anymore
+
2007-04-22 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.7.9
* DEPENDS: added libxml2
diff --git a/gnome2-libs/gnome-games2/CONFIGURE
b/gnome2-libs/gnome-games2/CONFIGURE
index fb1f6dd..d8584d1 100755
--- a/gnome2-libs/gnome-games2/CONFIGURE
+++ b/gnome2-libs/gnome-games2/CONFIGURE
@@ -1,17 +1 @@
-if [ -f /etc/sorcery/local/depends/guile.p ]
-then
- . /etc/sorcery/local/depends/guile.p
-fi
-
-if [ "$G_18" = "y" ]
-then
- message "\n${MESSAGE_COLOR}" \
- "${SPELL} isn't released for guile 1.8, so it may not works\n\n"
-
- if ! query "Would you like to continue?" n;
- then
- message "${MESSAGE_COLOR}Please recast later!\n"
- return 1
- fi
-fi
config_query HISCORES "Backup and restore high scores?" y
diff --git a/gnome2-libs/gnome-games2/CONFLICTS
b/gnome2-libs/gnome-games2/CONFLICTS
index 5bd9f76..e7774af 100755
--- a/gnome2-libs/gnome-games2/CONFLICTS
+++ b/gnome2-libs/gnome-games2/CONFLICTS
@@ -1,3 +1,2 @@
-conflicts gnome-games &&
-conflicts gnome-sudoku
-
+conflicts gnome-sudoku &&
+conflicts gnome-games y
diff --git a/gnome2-libs/gnome-games2/HISTORY
b/gnome2-libs/gnome-games2/HISTORY
index dab300e..1b6fe27 100644
--- a/gnome2-libs/gnome-games2/HISTORY
+++ b/gnome2-libs/gnome-games2/HISTORY
@@ -1,6 +1,12 @@
+2007-05-10 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFLICTS: default to dispel gnome-games for deprecation
+
2007-05-04 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.1.1

+2007-04-23 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFIGURE: removed warning about new guile version
+
2007-04-09 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.1

diff --git a/gnome2-libs/gnome-utils2/CONFLICTS
b/gnome2-libs/gnome-utils2/CONFLICTS
index ec1ff6c..b784d28 100755
--- a/gnome2-libs/gnome-utils2/CONFLICTS
+++ b/gnome2-libs/gnome-utils2/CONFLICTS
@@ -1 +1 @@
-conflicts gnome-utils
+conflicts gnome-utils y
diff --git a/gnome2-libs/gnome-utils2/HISTORY
b/gnome2-libs/gnome-utils2/HISTORY
index ad988a2..d834763 100644
--- a/gnome2-libs/gnome-utils2/HISTORY
+++ b/gnome2-libs/gnome-utils2/HISTORY
@@ -1,3 +1,6 @@
+2007-05-10 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFLICTS: default to dispelling gnome-utils for deprecation
+
2007-04-14 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.1

diff --git a/gnome2-libs/gnome2-profile/CONFLICTS
b/gnome2-libs/gnome2-profile/CONFLICTS
index b482ab8..2c37e4d 100755
--- a/gnome2-libs/gnome2-profile/CONFLICTS
+++ b/gnome2-libs/gnome2-profile/CONFLICTS
@@ -1 +1,2 @@
conflicts gnome-2-desktop-profile
+conflicts gnome-karubik-profile y
diff --git a/gnome2-libs/gnome2-profile/HISTORY
b/gnome2-libs/gnome2-profile/HISTORY
index 7be9c4c..ae5c4bb 100644
--- a/gnome2-libs/gnome2-profile/HISTORY
+++ b/gnome2-libs/gnome2-profile/HISTORY
@@ -1,3 +1,6 @@
+2007-05-10 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFLICTS: added conflict gnome-karubik-profile for deprecation
+
2006-09-17 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated to 2.16.0
* DEPENDS: added gnome-vfs-monikers
diff --git a/http/elinks/CONFIGURE b/http/elinks/CONFIGURE
deleted file mode 100755
index 55601be..0000000
--- a/http/elinks/CONFIGURE
+++ /dev/null
@@ -1,16 +0,0 @@
-if [ -f /etc/sorcery/local/depends/guile.p ]
-then
- . /etc/sorcery/local/depends/guile.p
-fi
-
-if [ "$G_18" = "y" ]
-then
- message "\n${MESSAGE_COLOR}" \
- "${SPELL} isn't released for guile 1.8, so it may not works\n\n"
-
- if ! query "Would you like to continue?" n;
- then
- message "${MESSAGE_COLOR}Please recast later!\n"
- return 1
- fi
-fi
diff --git a/http/elinks/HISTORY b/http/elinks/HISTORY
index 250d326..fd13bf3 100644
--- a/http/elinks/HISTORY
+++ b/http/elinks/HISTORY
@@ -1,3 +1,6 @@
+2007-04-23 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFIGURE: removed guile version warning
+
2007-04-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.11.3, SECURITY_PATCH=1

diff --git a/http/guile-www/CONFIGURE b/http/guile-www/CONFIGURE
deleted file mode 100755
index 55601be..0000000
--- a/http/guile-www/CONFIGURE
+++ /dev/null
@@ -1,16 +0,0 @@
-if [ -f /etc/sorcery/local/depends/guile.p ]
-then
- . /etc/sorcery/local/depends/guile.p
-fi
-
-if [ "$G_18" = "y" ]
-then
- message "\n${MESSAGE_COLOR}" \
- "${SPELL} isn't released for guile 1.8, so it may not works\n\n"
-
- if ! query "Would you like to continue?" n;
- then
- message "${MESSAGE_COLOR}Please recast later!\n"
- return 1
- fi
-fi
diff --git a/http/guile-www/DETAILS b/http/guile-www/DETAILS
index 7df3f1f..cac9ba0 100755
--- a/http/guile-www/DETAILS
+++ b/http/guile-www/DETAILS
@@ -8,6 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[0]=GPL
ENTERED=20041107
KEYWORDS="http"
+ DOCS="COPYING ChangeLog NEWS README"
SHORT="A set of Guile Scheme modules to facilitate HTTP."
cat << EOF
Guile-WWW is a set of Guile Scheme modules providing support for navigating
diff --git a/http/guile-www/HISTORY b/http/guile-www/HISTORY
index 40ef1d7..0df6156 100644
--- a/http/guile-www/HISTORY
+++ b/http/guile-www/HISTORY
@@ -1,3 +1,7 @@
+2007-04-23 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFIGURE: removed
+ * DETAILS: added DOCS so it doesn't install texinfo sources
+
2006-10-11 Maurizio Borini <baux AT sourcemange.org>
* CONFIGURE: Add warning about guile major update.

diff --git a/libs/serveez/BUILD b/libs/serveez/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/libs/serveez/BUILD
@@ -0,0 +1 @@
+true
diff --git a/libs/serveez/CONFIGURE b/libs/serveez/CONFIGURE
deleted file mode 100755
index 55601be..0000000
--- a/libs/serveez/CONFIGURE
+++ /dev/null
@@ -1,16 +0,0 @@
-if [ -f /etc/sorcery/local/depends/guile.p ]
-then
- . /etc/sorcery/local/depends/guile.p
-fi
-
-if [ "$G_18" = "y" ]
-then
- message "\n${MESSAGE_COLOR}" \
- "${SPELL} isn't released for guile 1.8, so it may not works\n\n"
-
- if ! query "Would you like to continue?" n;
- then
- message "${MESSAGE_COLOR}Please recast later!\n"
- return 1
- fi
-fi
diff --git a/libs/serveez/DEPENDS b/libs/serveez/DEPENDS
deleted file mode 100755
index 6f3bbd8..0000000
--- a/libs/serveez/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends guile
diff --git a/libs/serveez/DETAILS b/libs/serveez/DETAILS
index 4ddd8f9..f94de7f 100755
--- a/libs/serveez/DETAILS
+++ b/libs/serveez/DETAILS
@@ -1,13 +1,13 @@
SPELL=serveez
VERSION=0.1.1
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
+# SOURCE=$SPELL-$VERSION.tar.gz
+#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+# SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
WEB_SITE=http://www.gnu.org/software/serveez/
-
SOURCE_HASH=sha512:e04e006e7e6653384cba197ff6c368cd0c5490966b22a00cf6d3b224c5b6c250e9342977945059bb912cc4bfda1b135e7463c8ca352c98fb16faeadddca3ee6a
+#
SOURCE_HASH=sha512:e04e006e7e6653384cba197ff6c368cd0c5490966b22a00cf6d3b224c5b6c250e9342977945059bb912cc4bfda1b135e7463c8ca352c98fb16faeadddca3ee6a
LICENSE[0]=GPL
ENTERED=20050201
- BUILD_AIP=2
+ PATCHLEVEL=1
KEYWORDS="libs"
SHORT="Serveez is a server framework."

diff --git a/libs/serveez/HISTORY b/libs/serveez/HISTORY
index 324e3f6..872b22a 100644
--- a/libs/serveez/HISTORY
+++ b/libs/serveez/HISTORY
@@ -1,3 +1,7 @@
+2007-05-10 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * all: deprecated spell, upstream has been unmaintained for years and
+ it doesn't build anymore
+
2006-10-11 Maurizio Boriani <baux AT sourcemage.org>
* CONFIGURE: Add warning about guile major update.

diff --git a/libs/serveez/INSTALL b/libs/serveez/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/libs/serveez/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/libs/serveez/PRE_BUILD b/libs/serveez/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/libs/serveez/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/libs/serveez/TRIGGERS b/libs/serveez/TRIGGERS
new file mode 100755
index 0000000..f5e0e60
--- /dev/null
+++ b/libs/serveez/TRIGGERS
@@ -0,0 +1 @@
+on_cast serveez dispel_self
diff --git a/libs/slib/DETAILS b/libs/slib/DETAILS
index b134cd4..d74bb07 100755
--- a/libs/slib/DETAILS
+++ b/libs/slib/DETAILS
@@ -1,13 +1,11 @@
SPELL=slib
- VERSION=3a4
-
SOURCE_HASH=sha512:3b80bdcdd2a1174b5d4e687efa726242d3aac72db665fcfa1abfedc383c541d9bda82b526a990d2b0c191f1c8031a57b16842369f281a6469513b23eae84884c
+ VERSION=3a1
SOURCE=$SPELL$VERSION.zip
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
- SOURCE_URL[0]=http://swissnet.ai.mit.edu/ftpdir/scm/$SOURCE
- SOURCE_URL[1]=http://www.ibiblio.org/pub/gnu/slib/$SOURCE
+ SOURCE_URL[0]=http://swissnet.ai.mit.edu/ftpdir/scm/OLD/$SOURCE
WEB_SITE=http://www-swiss.ai.mit.edu/~jaffer/SLIB.html
ENTERED=20011105
- PATCHLEVEL=1
LICENSE[0]=http://www-swiss.ai.mit.edu/~jaffer/SLIB_COPYING.txt
KEYWORDS="libs"
SHORT="Scheme library"
diff --git a/libs/slib/HISTORY b/libs/slib/HISTORY
index 1753eeb..1d4e700 100644
--- a/libs/slib/HISTORY
+++ b/libs/slib/HISTORY
@@ -1,3 +1,10 @@
+2007-05-09 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * INSTALL: load mklibcat.scm, otherwise the installed slib isn't
+ usable
+ * DETAILS: downgraded to 3a1, newer versions don't work without
+ additional commandline arguments that you can't give apps that embed
+ guile
+
2007-03-03 Jeremy Blosser <jblosser-smgl AT firinn.org>
* INSTALL: Replace bad TRACK_ROOT usage (automated).

diff --git a/libs/slib/INSTALL b/libs/slib/INSTALL
index 5de0b92..b0f905c 100755
--- a/libs/slib/INSTALL
+++ b/libs/slib/INSTALL
@@ -6,5 +6,7 @@ mkdir -p $SLIB &&
cp * $SLIB &&
ln -sf ${TRACK_ROOT}/usr/lib/slib $GUILE &&
# initialize
+guile -c \
+"(use-modules (ice-9 slib)) (load \"${GUILE}/mklibcat.scm\")" &&
guile -s $SLIB/guile.init -c \
"(use-modules (ice-9 slib)) (require 'new-catalog)" "(exit)"
diff --git a/libs/slib/slib3a1.zip.sig b/libs/slib/slib3a1.zip.sig
new file mode 100644
index 0000000..ba9f868
Binary files /dev/null and b/libs/slib/slib3a1.zip.sig differ
diff --git a/mail/anubis/CONFIGURE b/mail/anubis/CONFIGURE
index f1516fd..1db2d3f 100755
--- a/mail/anubis/CONFIGURE
+++ b/mail/anubis/CONFIGURE
@@ -1,19 +1,3 @@
-if [ -f /etc/sorcery/local/depends/guile.p ]
-then
- . /etc/sorcery/local/depends/guile.p
-fi
-
-if [ "$G_18" = "y" ]
-then
- message "\n${MESSAGE_COLOR}" \
- "${SPELL} isn't released for guile 1.8, so it may not works\n\n"
-
- if ! query "Would you like to continue?" n;
- then
- message "${MESSAGE_COLOR}Please recast later!\n"
- return 1
- fi
-fi
config_query_list ANUBIS_TLS "Which TLS/SSL lib do you wish to use" \
"none" "gnutls" "openssl" &&
config_query_list ANUBIS_DB "Which database backend do you wish to use" \
diff --git a/mail/anubis/DEPENDS b/mail/anubis/DEPENDS
index 7ff745f..ea538c5 100755
--- a/mail/anubis/DEPENDS
+++ b/mail/anubis/DEPENDS
@@ -38,6 +38,6 @@ then
depends postgresql "--with-postgres --without-mysql --without-gdbm"
elif [[ ${ANUBIS_DB} == "gdbm" ]]
then
- depends postgresql "--with-gdbm --without-mysql --without-postgres"
+ depends gdbm "--with-gdbm --without-mysql --without-postgres"
fi

diff --git a/mail/anubis/HISTORY b/mail/anubis/HISTORY
index d52a074..9169f9b 100644
--- a/mail/anubis/HISTORY
+++ b/mail/anubis/HISTORY
@@ -1,3 +1,7 @@
+2007-04-23 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFIGURE: removed guile version warning
+ * DEPENDS: actually depend on gdbm if it's chosen, not on postgresql
+
2006-10-11 Maurizio Boriani <baux AT sourcemage.org>
* CONFIGURE: Add warning about guile major update.

diff --git a/mail/mailutils/BUILD b/mail/mailutils/BUILD
index 57fb943..df94ba7 100755
--- a/mail/mailutils/BUILD
+++ b/mail/mailutils/BUILD
@@ -1,49 +1,2 @@
-if [ "$PAM" == "y" ];
-then
- MYCONF="--enable-pam " &&
- message "${MESSAGE_COLOR}Using linux-pam${DEFAULT_COLOR}"
-fi &&
-if [ "$VDOM" == "y" ];
-then
- MYCONF="$MYCONF --enable-virtual-domains " &&
- message "${MESSAGE_COLOR}Using Virtual Domains ${DEFAULT_COLOR}"
-fi &&
-if [ "$IMAP" == "y" ];
-then
- MYCONF="$MYCONF --enable-imap"
- message "${MESSAGE_COLOR}Using IMAP ${DEFAULT_COLOR}"
-fi &&
-if [ "$POP" == "y" ];
-then
- MYCONF="$MYCONF --enable-pop"
- message "${MESSAGE_COLOR}Using POP ${DEFAULT_COLOR}"
-fi &&
-if [ "$SMTP" == "y" ];
-then
- MYCONF="$MYCONF --enable-smtp"
- message "${MESSAGE_COLOR}Using SMTP ${DEFAULT_COLOR}"
-fi &&
-if [ "$SENDMAIL" == "y" ];
-then
- MYCONF="$MYCONF --enable-sendmail"
- message "${MESSAGE_COLOR}Using SENDMAIL ${DEFAULT_COLOR}"
-fi &&
-if [ "$MAILDIR" == "y" ];
-then
- MYCONF="$MYCONF --enable-maildir"
- message "${MESSAGE_COLOR}Using MAILDIR ${DEFAULT_COLOR}"
-fi &&
-
-
-./configure \
- --bindir=${INSTALL_ROOT}/usr/bin \
- --sbindir=${INSTALL_ROOT}/usr/sbin \
- --datadir=${INSTALL_ROOT}/usr/share \
- --sysconfdir=${INSTALL_ROOT}/etc/mailutils \
- --includedir=${INSTALL_ROOT}/usr/include \
- --infodir=${INSTALL_ROOT}/usr/info \
- --mandir=${INSTALL_ROOT}/usr/share/man \
- --libdir=${INSTALL_ROOT}/usr/lib \
- $OPTS \
- $MYCONF &&
-make
+OPTS="$MU_OPTS --sysconfdir=${INSTALL_ROOT}/etc/mailutils $OPTS" &&
+default_build
diff --git a/mail/mailutils/CONFIGURE b/mail/mailutils/CONFIGURE
index 700bdaa..25e3a64 100755
--- a/mail/mailutils/CONFIGURE
+++ b/mail/mailutils/CONFIGURE
@@ -1,7 +1,6 @@
-config_query PAM "Add PAM support?" y
-config_query VDOM "Add virtual domains support?" y
-config_query IMAP "Add imap support?" y
-config_query POP "Add pop support?" y
-config_query SMTP "Add smtp support?" y
-config_query SENDMAIL "Add sendmail support?" y
-config_query MAILDIR "Add maildir support?" y
\ No newline at end of file
+config_query_option MU_OPTS "Add virtual domains support?" y
"--enable-virtual-domains" "--disable-virtual-domains" &&
+config_query_option MU_OPTS "Add imap support?" y "--enable-imap"
"--disable-imap"
+config_query_option MU_OPTS "Add pop support?" y "--enable-pop"
"--disable-pop"
+config_query_option MU_OPTS "Add smtp support?" y "--enable-smtp"
"--disable-smtp"
+config_query_option MU_OPTS "Add sendmail support?" y "--enable-sendmail"
"--disable-sendmail"
+config_query_option MU_OPTS "Add maildir support?" y "--enable-maildir"
"--disable-maildir"
diff --git a/mail/mailutils/DEPENDS b/mail/mailutils/DEPENDS
index 8927342..fdc7b37 100755
--- a/mail/mailutils/DEPENDS
+++ b/mail/mailutils/DEPENDS
@@ -1,6 +1,2 @@
depends guile &&
-
-if [ "$PAM" == "y" ];
-then
- depends linux-pam
-fi
+optional_depends linux-pam "--enable-pam" "--disable-pam" "for pam support"
diff --git a/mail/mailutils/HISTORY b/mail/mailutils/HISTORY
index f29f093..a03a0f2 100644
--- a/mail/mailutils/HISTORY
+++ b/mail/mailutils/HISTORY
@@ -1,3 +1,8 @@
+2007-05-11 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFIGURE, BUILD, DEPENDS: made linux-pam a normal optional_depends
+ * CONFIGURE, BUILD: convert all queries to config_query_option, use
+ default_build
+
2006-10-11 Maurizio Borini <baux AT sourcemange.org>
* CONFIGURE: Add warning about guile major update.

diff --git a/x11-toolkits/guile-gtk/CONFIGURE
b/x11-toolkits/guile-gtk/CONFIGURE
deleted file mode 100755
index 55601be..0000000
--- a/x11-toolkits/guile-gtk/CONFIGURE
+++ /dev/null
@@ -1,16 +0,0 @@
-if [ -f /etc/sorcery/local/depends/guile.p ]
-then
- . /etc/sorcery/local/depends/guile.p
-fi
-
-if [ "$G_18" = "y" ]
-then
- message "\n${MESSAGE_COLOR}" \
- "${SPELL} isn't released for guile 1.8, so it may not works\n\n"
-
- if ! query "Would you like to continue?" n;
- then
- message "${MESSAGE_COLOR}Please recast later!\n"
- return 1
- fi
-fi
diff --git a/x11-toolkits/guile-gtk/DEPENDS b/x11-toolkits/guile-gtk/DEPENDS
index 8e31b5b..5e17dd5 100755
--- a/x11-toolkits/guile-gtk/DEPENDS
+++ b/x11-toolkits/guile-gtk/DEPENDS
@@ -1,6 +1,4 @@
-depends gtk+ &&
-depends guile &&
-optional_depends "libglade" \
- "--with-libglade" \
- "--without-libglade" \
- "for libglade support"
+depends gtk+2 &&
+depends guile &&
+optional_depends libglade2 "--with-libglade" "--without-libglade" "for
libglade support" &&
+optional_depends gtkglarea2 "--with-gtkgl" "--without-gtkgl" "for OpenGL
support"
diff --git a/x11-toolkits/guile-gtk/DETAILS b/x11-toolkits/guile-gtk/DETAILS
index 6dd83c5..0386d54 100755
--- a/x11-toolkits/guile-gtk/DETAILS
+++ b/x11-toolkits/guile-gtk/DETAILS
@@ -1,9 +1,9 @@
SPELL=guile-gtk
- VERSION=0.5
+ VERSION=2.0
SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.gnu.org/gnu/guile-gtk/$SOURCE
-
SOURCE_HASH=sha512:efc2f75758cede7c796414e58e6de52a6cd4ffd8566c567acd99e7ca6896e7f6f16bf961e3fbba4898d06282c512a3d065d87540e95a32700638e1182ea6ff5d
LICENSE[0]=GPL
WEB_SITE=http://www.gnu.org/software/guile-gtk/
ENTERED=20020214
diff --git a/x11-toolkits/guile-gtk/HISTORY b/x11-toolkits/guile-gtk/HISTORY
index ca2c618..781fd0a 100644
--- a/x11-toolkits/guile-gtk/HISTORY
+++ b/x11-toolkits/guile-gtk/HISTORY
@@ -1,3 +1,8 @@
+2007-04-23 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 2.0
+ * CONFIGURE: removed
+ * DEPENDS: depends on gtk+2, optionally on libglade2 and gtkglarea2
+
2006-10-11 Maurizio Borini <baux AT sourcemange.org>
* CONFIGURE: Add warning about guile major update.

diff --git a/x11-toolkits/guile-gtk/guile-gtk-2.0.tar.gz.sig
b/x11-toolkits/guile-gtk/guile-gtk-2.0.tar.gz.sig
new file mode 100644
index 0000000..6811e78
Binary files /dev/null and b/x11-toolkits/guile-gtk/guile-gtk-2.0.tar.gz.sig
differ



  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (d7b2b6655e1af4c2ace11c685c33a2a4eb46a45f), Arwed von Merkatz, 05/11/2007

Archive powered by MHonArc 2.6.24.

Top of Page