- Update to 0.7.2

  Changes: http://beast.gtk.org/news-file
- Unbreak on sparc64

10 files changed, 232 insertions, 894 deletions

diff --git a/audio/beast/Makefile b/audio/beast/Makefile
index 36b8dea8774a..a7346ce7ffaf 100644
--- a/audio/beast/Makefile
+++ b/audio/beast/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	beast
-PORTVERSION=	0.7.1
-PORTREVISION=	9
+PORTVERSION=	0.7.2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://beast.gtk.org/pub/beast/v0.7/ \
 		http://beast.gtk.org/beast-ftp/v0.7/
@@ -33,7 +32,9 @@ CONFIGURE_ARGS=	--disable-debug \
 		--enable-ossmidi=/dev/midi
 MAKE_JOBS_UNSAFE=	yes
 
-MAN1=		beast.1 bsescm.1 sfidl.1
+PLIST_SUB+=	PORTVERSION=${PORTVERSION}
+
+MAN1=		beast.1 bsescm.1 bsewavetool.1 sfidl.1
 MAN5=		bse.5
 
 post-patch:
@@ -45,10 +46,4 @@ post-patch:
 		${WRKSRC}/bse/Makefile.in \
 		${WRKSRC}/bse/zintern/Makefile.in
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile on sparc64
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/beast/distinfo b/audio/beast/distinfo
index 3ccd354201e4..4f3cc676b5a1 100644
--- a/audio/beast/distinfo
+++ b/audio/beast/distinfo
@@ -1,3 +1,3 @@
-MD5 (beast-0.7.1.tar.bz2) = f8b54ca8e7936ac7c85583ade45d3be3
-SHA256 (beast-0.7.1.tar.bz2) = b4bc1dfb3bba22f7fe1a5588d2d4a66c746e9c7607709304b13aa390420cd44b
-SIZE (beast-0.7.1.tar.bz2) = 5806537
+MD5 (beast-0.7.2.tar.bz2) = 5e25d580a282307546dc199c032cc359
+SHA256 (beast-0.7.2.tar.bz2) = 91bf47b74d35fe4c078e3bfbcecb21cd490ac83ce2fbca1bc63687212626f289
+SIZE (beast-0.7.2.tar.bz2) = 6421498
diff --git a/audio/beast/files/patch-birnet_birnetcdefs.h b/audio/beast/files/patch-birnet_birnetcdefs.h
index 1e5b8afd6b65..10d0d0bcf9f5 100644
--- a/audio/beast/files/patch-birnet_birnetcdefs.h
+++ b/audio/beast/files/patch-birnet_birnetcdefs.h
@@ -1,7 +1,7 @@
---- birnet/birnetcdefs.h.orig	2008-02-26 23:16:19.000000000 +0100
-+++ birnet/birnetcdefs.h	2008-02-26 23:16:44.000000000 +0100
+--- birnet/birnetcdefs.h.orig	2010-09-15 12:21:26.000000000 +0000
++++ birnet/birnetcdefs.h	2010-09-15 12:21:17.000000000 +0000
 @@ -24,6 +24,13 @@
- #include <sys/types.h>			/* uint, ssize */
+ #include <float.h>                      /* {FLT|DBL}_{MIN|MAX|EPSILON} */
  #include <birnet/birnetconfig.h>
  
 +/*
diff --git a/audio/beast/files/patch-birnet_birnettests.h b/audio/beast/files/patch-birnet_birnettests.h
deleted file mode 100644
index d2b5243abda1..000000000000
--- a/audio/beast/files/patch-birnet_birnettests.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- birnet/birnettests.h.orig	2008-03-07 17:39:39.000000000 +0100
-+++ birnet/birnettests.h	2008-03-07 17:39:52.000000000 +0100
-@@ -27,6 +27,7 @@
- 
- #include <glib.h>
- #include <string.h>
-+#include <signal.h>
- 
- BIRNET_EXTERN_C_BEGIN();
- 
diff --git a/audio/beast/files/patch-birnet_birnetthreadimpl.cc b/audio/beast/files/patch-birnet_birnetthreadimpl.cc
deleted file mode 100644
index 56e42e7d34b0..000000000000
--- a/audio/beast/files/patch-birnet_birnetthreadimpl.cc
+++ /dev/null
@@ -1,27 +0,0 @@
---- birnet/birnetthreadimpl.cc.orig	2010-05-11 15:06:34.000000000 +0200
-+++ birnet/birnetthreadimpl.cc	2010-05-11 15:07:34.000000000 +0200
-@@ -1483,18 +1483,22 @@ fallback_thread_exit (gpointer retval)
- 
- #ifdef g_atomic_int_get
- static int
--(g_atomic_int_get) (volatile int *atomic)
-+birnet_g_atomic_int_get (volatile int *atomic)
- {
-   return g_atomic_int_get (atomic);
- }
-+#undef  g_atomic_int_get
-+#define g_atomic_int_get birnet_g_atomic_int_get
- #endif
- 
- #ifdef g_atomic_pointer_get
- static void*
--(g_atomic_pointer_get) (volatile void **atomic)
-+birnet_g_atomic_pointer_get (volatile void **atomic)
- {
-   return (void*) g_atomic_pointer_get (atomic);
- }
-+#undef  g_atomic_pointer_get
-+#define g_atomic_pointer_get birnet_g_atomic_pointer_get
- #endif
- 
- 
diff --git a/audio/beast/files/patch-bse_bsecxxplugin.hh b/audio/beast/files/patch-bse_bsecxxplugin.hh
new file mode 100644
index 000000000000..855f601fc97c
--- /dev/null
+++ b/audio/beast/files/patch-bse_bsecxxplugin.hh
@@ -0,0 +1,38 @@
+--- bse/bsecxxplugin.hh.orig	2010-09-16 07:35:32.000000000 +0000
++++ bse/bsecxxplugin.hh	2010-09-16 07:36:25.000000000 +0000
+@@ -55,7 +55,7 @@
+ #define BSE_CXX_REGISTER_STATIC_HOOK(HookType)  BSE_CXX_REGISTER_HOOK_NODE (HookType, 1)
+ #define BSE_CXX_REGISTER_HOOK_NODE(HookType, __static)                  \
+   template<class E> static BseExportNode* bse_export_node ();           \
+-  template<> inline BseExportNode*                                      \
++  template<> inline static BseExportNode*                                      \
+   bse_export_node<HookType> ()                                          \
+   {                                                                     \
+     static BseExportNodeHook hnode = {                                  \
+@@ -90,7 +90,7 @@
+   (::NameSpace::bse_type_keeper__3##EnumType.get_type ())
+ #define BSE_CXX_DECLARE_ENUM(EnumType,EnumName,N,ICode)                 \
+   template<class E> static BseExportNode* bse_export_node ();           \
+-  template<> BseExportNode*                                             \
++  template<> static BseExportNode*                                             \
+   bse_export_node<EnumType> ()                                          \
+   {                                                                     \
+     static BseExportNodeEnum enode = {                                  \
+@@ -144,7 +144,7 @@
+   (::NameSpace::bse_type_keeper__1##RecordType.get_type ())
+ #define BSE_CXX_DECLARE_RECORD(RecordType)                              \
+   template<class E> static BseExportNode* bse_export_node ();           \
+-  template<> BseExportNode*                                             \
++  template<> static BseExportNode*                                             \
+   bse_export_node<RecordType> ()                                        \
+   {                                                                     \
+     static BseExportNodeBoxed bnode = {                                 \
+@@ -180,7 +180,7 @@
+   (::NameSpace::bse_type_keeper__2##SequenceType.get_type ())
+ #define BSE_CXX_DECLARE_SEQUENCE(SequenceType)                                  \
+   template<class E> static BseExportNode* bse_export_node ();                   \
+-  template<> BseExportNode*                                                     \
++  template<> static BseExportNode*                                                     \
+   bse_export_node<SequenceType> ()                                              \
+   {                                                                             \
+     static BseExportNodeBoxed bnode = {                                         \
diff --git a/audio/beast/files/patch-guile18.diff b/audio/beast/files/patch-guile18.diff
deleted file mode 100644
index e151b82a0ecb..000000000000
--- a/audio/beast/files/patch-guile18.diff
+++ /dev/null
@@ -1,686 +0,0 @@
-diff --git ChangeLog ChangeLog
-index cef9b98..f4b726d 100644
---- ChangeLog
-+++ ChangeLog
-@@ -1,3 +1,16 @@
-+Tue Jan 23 02:08:24 2007  Tim Janik  <timj@gtk.org>
-+
-+	* shell/bsescminterp.c: ported to guile-1.8. kept guile-1.6 compat
-+	code, removed cruft that was deprecated in 1.6 and removed from 1.8.
-+
-+	* shell/bsescminterp.h: removed bsescminterp.c implementation details.
-+
-+	* shell/bsescm.c: changed debugging hooks:
-+	BSESCM_SLEEP4GDB>=3: sleep before parsing args;
-+	BSESCM_SLEEP4GDB>=2: sleep after parsing args;
-+	BSESCM_SLEEP4GDB>=1: sleep after parsing args when not registering;
-+	otherwise: don't sleep.
-+
- Sun Jan 21 01:39:15 2007  Tim Janik  <timj@gtk.org>
- 
- 	* birnet/: Merged with http://birnet.org/git/birnet.git
-diff --git shell/bsescm.c shell/bsescm.c
-index ee66357..3106d99 100644
---- shell/bsescm.c
-+++ 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 shell/bsescminterp.c shell/bsescminterp.c
-index cad810b..976c597 100644
---- shell/bsescminterp.c
-+++ 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 shell/bsescminterp.h shell/bsescminterp.h
-index 73842bb..e8dc017 100644
---- shell/bsescminterp.h
-+++ 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/beast/files/patch-tools_bsefextract.cc b/audio/beast/files/patch-tools_bsefextract.cc
new file mode 100644
index 000000000000..f8b1ed617255
--- /dev/null
+++ b/audio/beast/files/patch-tools_bsefextract.cc
@@ -0,0 +1,11 @@
+--- tools/bsefextract.cc.orig	2010-09-16 10:07:57.000000000 +0000
++++ tools/bsefextract.cc	2010-09-16 10:08:06.000000000 +0000
+@@ -1120,7 +1120,7 @@
+ 	  fft_size_samples);
+ 	g_printerr ("  * stepping     %5.2f ms    %6u samples\n",
+ 	  float (options.timing_window_stepping_ms),
+-	  uint (options.timing_window_stepping_ms * signal.mix_freq() / 1000));
++	  unsigned (options.timing_window_stepping_ms * signal.mix_freq() / 1000));
+       }
+ 
+     for (double offset_ms = 0; offset_ms < file_size_ms; offset_ms += options.timing_window_stepping_ms)
diff --git a/audio/beast/files/patch-tools_bseloopfuncs.c b/audio/beast/files/patch-tools_bseloopfuncs.c
index 313720a4c084..387d61d0a367 100644
--- a/audio/beast/files/patch-tools_bseloopfuncs.c
+++ b/audio/beast/files/patch-tools_bseloopfuncs.c
@@ -1,14 +1,6 @@
---- tools/bseloopfuncs.c.orig	2008-03-07 20:07:54.000000000 +0100
-+++ tools/bseloopfuncs.c	2008-03-07 20:11:50.000000000 +0100
-@@ -18,6 +18,7 @@
-  */
- #include "bseloopfuncs.h"
- #include <bse/gsldatacache.h>
-+#include <signal.h>
- #include <string.h>
- #include <stdio.h>
- #include <math.h>
-@@ -527,7 +528,7 @@
+--- tools/bseloopfuncs.c.orig	2010-02-14 00:47:12.000000000 +0000
++++ tools/bseloopfuncs.c	2010-09-15 12:05:05.000000000 +0000
+@@ -526,7 +526,7 @@
        ep = sp + minll;
        {
          gdouble score = score_headloop (dhandle, sp, ep - sp, config->block_length / 2, G_MAXDOUBLE);
@@ -17,3 +9,12 @@
          continue;
          if (score <= config->score)
            {
+@@ -555,7 +555,7 @@
+       for (ep = sp + minll; ep < cstart; ep++)
+         {
+           gdouble score = score_headloop (dhandle, sp, ep - sp, config->block_length / 2, config->score);
+-          g_print ("%u %.17g\n", ep - sp, score);
++          g_print ("%lu %.17g\n", ep - sp, score);
+           continue;
+           if (score <= config->score)
+             {
diff --git a/audio/beast/pkg-plist b/audio/beast/pkg-plist
index f9beb328bcba..427cd6af8286 100644
--- a/audio/beast/pkg-plist
+++ b/audio/beast/pkg-plist
@@ -1,16 +1,16 @@
 bin/beast
-bin/beast-0.7.1
+bin/beast-%%PORTVERSION%%
 bin/bsescm
-bin/bsescm-0.7.1
+bin/bsescm-%%PORTVERSION%%
+bin/bsewavetool
 bin/sfidl
 include/birnet/birnet.hh
 include/birnet/birnetcdefs.h
 include/birnet/birnetconfig.h
 include/birnet/birnetcpu.hh
+include/birnet/birnetdebugtools.hh
 include/birnet/birnetmath.hh
 include/birnet/birnetmsg.hh
-include/birnet/birnetsignal.hh
-include/birnet/birnetsignalvariants.hh
 include/birnet/birnettests.h
 include/birnet/birnetthread.hh
 include/birnet/birnetutf8.hh
@@ -161,137 +161,152 @@ include/sfi/sfiustore.h
 include/sfi/sfivalues.h
 include/sfi/sfivmarshal.h
 include/sfi/sfiwrapper.h
-lib/bse/v0.7.1/plugins/artsplugins.FPU.la
-lib/bse/v0.7.1/plugins/artsplugins.FPU.so
-lib/bse/v0.7.1/plugins/bseadder.FPU.la
-lib/bse/v0.7.1/plugins/bseadder.FPU.so
-lib/bse/v0.7.1/plugins/bseatandistort.FPU.la
-lib/bse/v0.7.1/plugins/bseatandistort.FPU.so
-lib/bse/v0.7.1/plugins/bseiirfilter.FPU.la
-lib/bse/v0.7.1/plugins/bseiirfilter.FPU.so
-lib/bse/v0.7.1/plugins/bsemixer.FPU.la
-lib/bse/v0.7.1/plugins/bsemixer.FPU.so
-lib/bse/v0.7.1/plugins/bsemult.FPU.la
-lib/bse/v0.7.1/plugins/bsemult.FPU.so
-lib/bse/v0.7.1/plugins/bseplugins.FPU.la
-lib/bse/v0.7.1/plugins/bseplugins.FPU.so
-lib/bse/v0.7.1/plugins/bsesequencer.FPU.la
-lib/bse/v0.7.1/plugins/bsesequencer.FPU.so
-lib/bse/v0.7.1/plugins/bsesimpleadsr.FPU.la
-lib/bse/v0.7.1/plugins/bsesimpleadsr.FPU.so
-lib/bse/v0.7.1/plugins/contribplugins.FPU.la
-lib/bse/v0.7.1/plugins/contribplugins.FPU.so
-lib/bse/v0.7.1/plugins/davcanyondelay.FPU.la
-lib/bse/v0.7.1/plugins/davcanyondelay.FPU.so
-lib/bse/v0.7.1/plugins/davorgan.FPU.la
-lib/bse/v0.7.1/plugins/davorgan.FPU.so
-lib/bse/v0.7.1/plugins/davplugins.FPU.la
-lib/bse/v0.7.1/plugins/davplugins.FPU.so
-lib/bse/v0.7.1/plugins/davsyndrum.FPU.la
-lib/bse/v0.7.1/plugins/davsyndrum.FPU.so
-lib/bse/v0.7.1/plugins/davxtalstrings.FPU.la
-lib/bse/v0.7.1/plugins/davxtalstrings.FPU.so
-lib/bse/v0.7.1/plugins/freeverb.la
-lib/bse/v0.7.1/plugins/freeverb.so
+lib/bse/v%%PORTVERSION%%/plugins/artsplugins.FPU.la
+lib/bse/v%%PORTVERSION%%/plugins/artsplugins.FPU.so
+lib/bse/v%%PORTVERSION%%/plugins/bseadder.FPU.la
+lib/bse/v%%PORTVERSION%%/plugins/bseadder.FPU.so
+lib/bse/v%%PORTVERSION%%/plugins/bseatandistort.FPU.la
+lib/bse/v%%PORTVERSION%%/plugins/bseatandistort.FPU.so
+lib/bse/v%%PORTVERSION%%/plugins/bseiirfilter.FPU.la
+lib/bse/v%%PORTVERSION%%/plugins/bseiirfilter.FPU.so
+lib/bse/v%%PORTVERSION%%/plugins/bsemixer.FPU.la
+lib/bse/v%%PORTVERSION%%/plugins/bsemixer.FPU.so
+lib/bse/v%%PORTVERSION%%/plugins/bsemult.FPU.la
+lib/bse/v%%PORTVERSION%%/plugins/bsemult.FPU.so
+lib/bse/v%%PORTVERSION%%/plugins/bseplugins.FPU.la
+lib/bse/v%%PORTVERSION%%/plugins/bseplugins.FPU.so
+lib/bse/v%%PORTVERSION%%/plugins/bsesequencer.FPU.la
+lib/bse/v%%PORTVERSION%%/plugins/bsesequencer.FPU.so
+lib/bse/v%%PORTVERSION%%/plugins/bsesimpleadsr.FPU.la
+lib/bse/v%%PORTVERSION%%/plugins/bsesimpleadsr.FPU.so
+lib/bse/v%%PORTVERSION%%/plugins/contribplugins.FPU.la
+lib/bse/v%%PORTVERSION%%/plugins/contribplugins.FPU.so
+lib/bse/v%%PORTVERSION%%/plugins/davcanyondelay.FPU.la
+lib/bse/v%%PORTVERSION%%/plugins/davcanyondelay.FPU.so
+lib/bse/v%%PORTVERSION%%/plugins/davorgan.FPU.la
+lib/bse/v%%PORTVERSION%%/plugins/davorgan.FPU.so
+lib/bse/v%%PORTVERSION%%/plugins/davplugins.FPU.la
+lib/bse/v%%PORTVERSION%%/plugins/davplugins.FPU.so
+lib/bse/v%%PORTVERSION%%/plugins/davsyndrum.FPU.la
+lib/bse/v%%PORTVERSION%%/plugins/davsyndrum.FPU.so
+lib/bse/v%%PORTVERSION%%/plugins/davxtalstrings.FPU.la
+lib/bse/v%%PORTVERSION%%/plugins/davxtalstrings.FPU.so
+lib/bse/v%%PORTVERSION%%/plugins/freeverb.la
+lib/bse/v%%PORTVERSION%%/plugins/freeverb.so
 lib/libbse-0.7.so
-lib/libbse-0.7.so.1
+lib/libbse-0.7.so.2
 lib/libbse.la
 lib/libbse.so
 libdata/pkgconfig/bse.pc
 share/application-registry/beast.applications
 share/applications/beast.desktop
-%%DATADIR%%/v0.7.1/docs/html/architecture.html
-%%DATADIR%%/v0.7.1/docs/html/beast-index.html
-%%DATADIR%%/v0.7.1/docs/html/beast.1.html
-%%DATADIR%%/v0.7.1/docs/html/bse-interface.html
-%%DATADIR%%/v0.7.1/docs/html/bse-objects.html
-%%DATADIR%%/v0.7.1/docs/html/bse.5.html
-%%DATADIR%%/v0.7.1/docs/html/bsescm.1.html
-%%DATADIR%%/v0.7.1/docs/html/coding-style.html
-%%DATADIR%%/v0.7.1/docs/html/engine-mplan.html
-%%DATADIR%%/v0.7.1/docs/html/faq.html
-%%DATADIR%%/v0.7.1/docs/html/images
-%%DATADIR%%/v0.7.1/docs/html/news-file.html
-%%DATADIR%%/v0.7.1/docs/html/plugin-devel.html
-%%DATADIR%%/v0.7.1/docs/html/quickstart.html
-%%DATADIR%%/v0.7.1/docs/html/sfidl-manual.html
-%%DATADIR%%/v0.7.1/docs/html/sfidl.1.html
-%%DATADIR%%/v0.7.1/docs/html/style/beast-dot.png
-%%DATADIR%%/v0.7.1/docs/html/style/beast-small.png
-%%DATADIR%%/v0.7.1/docs/html/style/beast-style.css
-%%DATADIR%%/v0.7.1/docs/html/style/doxer-style.css
-%%DATADIR%%/v0.7.1/docs/html/style/home-arrow-24x64.png
-%%DATADIR%%/v0.7.1/docs/html/style/plain.css
-%%DATADIR%%/v0.7.1/docs/html/style/title-arrow-24x64.png
-%%DATADIR%%/v0.7.1/images/beast-components.png
-%%DATADIR%%/v0.7.1/images/beast-mime.png
-%%DATADIR%%/v0.7.1/images/beast-progs.png
-%%DATADIR%%/v0.7.1/images/beast-splash.png
-%%DATADIR%%/v0.7.1/images/bse-mime.png
-%%DATADIR%%/v0.7.1/images/module-voices.png
-%%DATADIR%%/v0.7.1/keys/keyrc.de
-%%DATADIR%%/v0.7.1/keys/keyrc.us
-%%DATADIR%%/v0.7.1/skins/biogreen.skin
-%%DATADIR%%/v0.7.1/skins/blueimpress.skin
-%%DATADIR%%/v0.7.1/skins/brownforms.skin
-%%DATADIR%%/v0.7.1/skins/images/biogreen.jpg
-%%DATADIR%%/v0.7.1/skins/images/blueimpress.jpg
-%%DATADIR%%/v0.7.1/skins/images/brownforms.jpg
-%%DATADIR%%/v0.7.1/skins/images/moonpaper.png
-%%DATADIR%%/v0.7.1/skins/images/silvervein.png
-%%DATADIR%%/v0.7.1/skins/moonpaper.skin
-%%DATADIR%%/v0.7.1/skins/silvervein.skin
-%%DATADIR%%/v0.7.1/skins/white.skin
-share/bse/v0.7.1/demo/partymonster.bse
-share/bse/v0.7.1/demo/stereo-through.bse
-share/bse/v0.7.1/demo/x2-midi-test.bse
-share/bse/v0.7.1/effects/atan-canyon.bse
-share/bse/v0.7.1/effects/bqs-compressor.bse
-share/bse/v0.7.1/effects/bqs-reverb.bse
-share/bse/v0.7.1/effects/bqs-saturation-and-reverb.bse
-share/bse/v0.7.1/instruments/bqs-fretless-bass.bse
-share/bse/v0.7.1/instruments/bqs-merp-pad.bse
-share/bse/v0.7.1/instruments/bqs-moog-saw-bass.bse
-share/bse/v0.7.1/instruments/bqs-organ.bse
-share/bse/v0.7.1/instruments/bqs-queek-synth.bse
-share/bse/v0.7.1/instruments/bqs-syndrum.bse
-share/bse/v0.7.1/instruments/stw-iron-string.bse
-share/bse/v0.7.1/scripts/bse-scm-glue.boot
-share/bse/v0.7.1/scripts/mixer-splitup-by-track.scm
-share/bse/v0.7.1/scripts/modules2grid.scm
-share/bse/v0.7.1/scripts/part-harmonic-transposer.scm
-share/bse/v0.7.1/scripts/progressor-example.scm
-share/bse/v0.7.1/scripts/record-midi.scm
-share/bse/v0.7.1/scripts/song-parts-operations.scm
-share/locale/ar/LC_MESSAGES/beast-v0.7.1.mo
-share/locale/az/LC_MESSAGES/beast-v0.7.1.mo
-share/locale/bg/LC_MESSAGES/beast-v0.7.1.mo
-share/locale/ca/LC_MESSAGES/beast-v0.7.1.mo
-share/locale/cs/LC_MESSAGES/beast-v0.7.1.mo
-share/locale/de/LC_MESSAGES/beast-v0.7.1.mo
-share/locale/el/LC_MESSAGES/beast-v0.7.1.mo
-share/locale/en_CA/LC_MESSAGES/beast-v0.7.1.mo
-share/locale/en_GB/LC_MESSAGES/beast-v0.7.1.mo
-share/locale/eo/LC_MESSAGES/beast-v0.7.1.mo
-share/locale/es/LC_MESSAGES/beast-v0.7.1.mo
-share/locale/eu/LC_MESSAGES/beast-v0.7.1.mo
-share/locale/fi/LC_MESSAGES/beast-v0.7.1.mo
-share/locale/fr/LC_MESSAGES/beast-v0.7.1.mo
-share/locale/hr/LC_MESSAGES/beast-v0.7.1.mo
-share/locale/it/LC_MESSAGES/beast-v0.7.1.mo
-share/locale/ja/LC_MESSAGES/beast-v0.7.1.mo
-share/locale/mn/LC_MESSAGES/beast-v0.7.1.mo
-share/locale/ne/LC_MESSAGES/beast-v0.7.1.mo
-share/locale/nl/LC_MESSAGES/beast-v0.7.1.mo
-share/locale/pa/LC_MESSAGES/beast-v0.7.1.mo
-share/locale/pt/LC_MESSAGES/beast-v0.7.1.mo
-share/locale/pt_BR/LC_MESSAGES/beast-v0.7.1.mo
-share/locale/ru/LC_MESSAGES/beast-v0.7.1.mo
-share/locale/rw/LC_MESSAGES/beast-v0.7.1.mo
-share/locale/sq/LC_MESSAGES/beast-v0.7.1.mo
-share/locale/sr/LC_MESSAGES/beast-v0.7.1.mo
-share/locale/sr@Latn/LC_MESSAGES/beast-v0.7.1.mo
-share/locale/sv/LC_MESSAGES/beast-v0.7.1.mo
+%%DATADIR%%/v%%PORTVERSION%%/docs/html/Beast-Quickstart
+%%DATADIR%%/v%%PORTVERSION%%/docs/html/architecture.html
+%%DATADIR%%/v%%PORTVERSION%%/docs/html/beast-index.html
+%%DATADIR%%/v%%PORTVERSION%%/docs/html/beast.1.html
+%%DATADIR%%/v%%PORTVERSION%%/docs/html/beastdocs.css
+%%DATADIR%%/v%%PORTVERSION%%/docs/html/bse-interface.html
+%%DATADIR%%/v%%PORTVERSION%%/docs/html/bse-objects.html
+%%DATADIR%%/v%%PORTVERSION%%/docs/html/bse.5.html
+%%DATADIR%%/v%%PORTVERSION%%/docs/html/bsescm.1.html
+%%DATADIR%%/v%%PORTVERSION%%/docs/html/bsewavetool.1.html
+%%DATADIR%%/v%%PORTVERSION%%/docs/html/coding-style.html
+%%DATADIR%%/v%%PORTVERSION%%/docs/html/engine-mplan.html
+%%DATADIR%%/v%%PORTVERSION%%/docs/html/faq.html
+%%DATADIR%%/v%%PORTVERSION%%/docs/html/images
+%%DATADIR%%/v%%PORTVERSION%%/docs/html/news-file.html
+%%DATADIR%%/v%%PORTVERSION%%/docs/html/plugin-devel.html
+%%DATADIR%%/v%%PORTVERSION%%/docs/html/sfidl-manual.html
+%%DATADIR%%/v%%PORTVERSION%%/docs/html/sfidl.1.html
+%%DATADIR%%/v%%PORTVERSION%%/docs/html/style/beast-dot.png
+%%DATADIR%%/v%%PORTVERSION%%/docs/html/style/beast-small.png
+%%DATADIR%%/v%%PORTVERSION%%/docs/html/style/beast-style.css
+%%DATADIR%%/v%%PORTVERSION%%/docs/html/style/doxer-style.css
+%%DATADIR%%/v%%PORTVERSION%%/docs/html/style/home-arrow-24x64.png
+%%DATADIR%%/v%%PORTVERSION%%/docs/html/style/plain.css
+%%DATADIR%%/v%%PORTVERSION%%/docs/html/style/title-arrow-24x64.png
+%%DATADIR%%/v%%PORTVERSION%%/images/beast-components.png
+%%DATADIR%%/v%%PORTVERSION%%/images/beast-mime.png
+%%DATADIR%%/v%%PORTVERSION%%/images/beast-progs.png
+%%DATADIR%%/v%%PORTVERSION%%/images/beast-splash.png
+%%DATADIR%%/v%%PORTVERSION%%/images/bse-mime.png
+%%DATADIR%%/v%%PORTVERSION%%/images/module-voices.png
+%%DATADIR%%/v%%PORTVERSION%%/keys/keyrc.de
+%%DATADIR%%/v%%PORTVERSION%%/keys/keyrc.us
+%%DATADIR%%/v%%PORTVERSION%%/skins/biogreen.skin
+%%DATADIR%%/v%%PORTVERSION%%/skins/blueimpress.skin
+%%DATADIR%%/v%%PORTVERSION%%/skins/brownforms.skin
+%%DATADIR%%/v%%PORTVERSION%%/skins/images/biogreen.jpg
+%%DATADIR%%/v%%PORTVERSION%%/skins/images/blueimpress.jpg
+%%DATADIR%%/v%%PORTVERSION%%/skins/images/brownforms.jpg
+%%DATADIR%%/v%%PORTVERSION%%/skins/images/moonpaper.png
+%%DATADIR%%/v%%PORTVERSION%%/skins/images/silvervein.png
+%%DATADIR%%/v%%PORTVERSION%%/skins/moonpaper.skin
+%%DATADIR%%/v%%PORTVERSION%%/skins/silvervein.skin
+%%DATADIR%%/v%%PORTVERSION%%/skins/white.skin
+share/bse/v%%PORTVERSION%%/demo/partymonster.bse
+share/bse/v%%PORTVERSION%%/demo/stereo-through.bse
+share/bse/v%%PORTVERSION%%/demo/x2-midi-test.bse
+share/bse/v%%PORTVERSION%%/effects/atan-canyon.bse
+share/bse/v%%PORTVERSION%%/effects/bqs-compressor.bse
+share/bse/v%%PORTVERSION%%/effects/bqs-reverb.bse
+share/bse/v%%PORTVERSION%%/effects/bqs-saturation-and-reverb.bse
+share/bse/v%%PORTVERSION%%/instruments/bqs-bass-drum-e8012.bse
+share/bse/v%%PORTVERSION%%/instruments/bqs-fretless-bass.bse
+share/bse/v%%PORTVERSION%%/instruments/bqs-merp-pad.bse
+share/bse/v%%PORTVERSION%%/instruments/bqs-moog-saw-bass.bse
+share/bse/v%%PORTVERSION%%/instruments/bqs-organ.bse
+share/bse/v%%PORTVERSION%%/instruments/bqs-queek-synth.bse
+share/bse/v%%PORTVERSION%%/instruments/bqs-slow-hum.bse
+share/bse/v%%PORTVERSION%%/instruments/bqs-syndrum.bse
+share/bse/v%%PORTVERSION%%/instruments/fsm-fresh-water-bass.bse
+share/bse/v%%PORTVERSION%%/instruments/fsm-growl-bass.bse
+share/bse/v%%PORTVERSION%%/instruments/fsm-synth-string-sweep.bse
+share/bse/v%%PORTVERSION%%/instruments/illus-vtremolo.bse
+share/bse/v%%PORTVERSION%%/instruments/stw-iron-string.bse
+share/bse/v%%PORTVERSION%%/samples/retrokit.bsewave
+share/bse/v%%PORTVERSION%%/scripts/bse-scm-glue.boot
+share/bse/v%%PORTVERSION%%/scripts/mixer-splitup-by-track.scm
+share/bse/v%%PORTVERSION%%/scripts/modules2grid.scm
+share/bse/v%%PORTVERSION%%/scripts/part-harmonic-transposer.scm
+share/bse/v%%PORTVERSION%%/scripts/progressor-example.scm
+share/bse/v%%PORTVERSION%%/scripts/record-midi.scm
+share/bse/v%%PORTVERSION%%/scripts/song-parts-operations.scm
+share/locale/ar/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/az/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/bg/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/ca/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/cs/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/da/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/de/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/el/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/en_CA/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/en_GB/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/eo/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/es/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/eu/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/fi/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/fr/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/hr/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/it/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/ja/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/mn/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/nb/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/ne/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/nl/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/oc/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/pa/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/pt/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/pt_BR/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/ru/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/rw/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/sl/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/sq/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/sr/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/sr@Latn/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/sv/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/uk/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
+share/locale/zh_CN/LC_MESSAGES/beast-v%%PORTVERSION%%.mo
 share/mime-info/bse.keys
 share/mime-info/bse.mime
 share/mime/audio/x-bse.xml
@@ -304,26 +319,27 @@ share/pixmaps/beast.png
 @dirrmtry share/mime
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrm share/bse/v0.7.1/scripts
-@dirrm share/bse/v0.7.1/instruments
-@dirrm share/bse/v0.7.1/effects
-@dirrm share/bse/v0.7.1/demo
-@dirrm share/bse/v0.7.1
+@dirrm share/bse/v%%PORTVERSION%%/scripts
+@dirrm share/bse/v%%PORTVERSION%%/samples
+@dirrm share/bse/v%%PORTVERSION%%/instruments
+@dirrm share/bse/v%%PORTVERSION%%/effects
+@dirrm share/bse/v%%PORTVERSION%%/demo
+@dirrm share/bse/v%%PORTVERSION%%
 @dirrm share/bse
-@dirrm %%DATADIR%%/v0.7.1/skins/images
-@dirrm %%DATADIR%%/v0.7.1/skins
-@dirrm %%DATADIR%%/v0.7.1/keys
-@dirrm %%DATADIR%%/v0.7.1/images
-@dirrm %%DATADIR%%/v0.7.1/docs/html/style
-@dirrm %%DATADIR%%/v0.7.1/docs/html
-@dirrm %%DATADIR%%/v0.7.1/docs
-@dirrm %%DATADIR%%/v0.7.1
+@dirrm %%DATADIR%%/v%%PORTVERSION%%/skins/images
+@dirrm %%DATADIR%%/v%%PORTVERSION%%/skins
+@dirrm %%DATADIR%%/v%%PORTVERSION%%/keys
+@dirrm %%DATADIR%%/v%%PORTVERSION%%/images
+@dirrm %%DATADIR%%/v%%PORTVERSION%%/docs/html/style
+@dirrm %%DATADIR%%/v%%PORTVERSION%%/docs/html
+@dirrm %%DATADIR%%/v%%PORTVERSION%%/docs
+@dirrm %%DATADIR%%/v%%PORTVERSION%%
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
 @dirrmtry share/application-registry
 @dirrmtry share/mime-info
-@dirrm lib/bse/v0.7.1/plugins
-@dirrm lib/bse/v0.7.1
+@dirrm lib/bse/v%%PORTVERSION%%/plugins
+@dirrm lib/bse/v%%PORTVERSION%%
 @dirrm lib/bse
 @dirrm include/sfi
 @dirrm include/bse