Fix the first two or three build failures. Judging by what comes next

it is probably not worth trying to patch this any further, rather than
updating it (although there are/were some problems with things it may
depend on) but maybe making some progress will inspire someone else to
take this up.

In particular I tracked down the lossage where it was looking for vala
1.0 and the current vala versions are 0.12 and 0.14. It seems that
what someone optimistically intended at some point to be vala-1.0
(after vala-0.9) ended up released as vala-0.10.

7 files changed, 169 insertions, 1 deletions

diff --git a/devel/valide/distinfo b/devel/valide/distinfo
index 507523966dc..396340de3b9 100644
--- a/devel/valide/distinfo
+++ b/devel/valide/distinfo
@@ -1,6 +1,11 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/03/21 18:06:16 ahoka Exp $
+$NetBSD: distinfo,v 1.2 2012/04/02 04:02:46 dholland Exp $
 
 SHA1 (valide-0.4.0.tar.gz) = 0846f7a3e5494039b4abea4f8feb2b9e7b35ad16
 RMD160 (valide-0.4.0.tar.gz) = 9b4852bddeaaf88135676a77dd8bd0db4b90eaaa
 Size (valide-0.4.0.tar.gz) = 1427041 bytes
 SHA1 (patch-aa) = 81aa8bf7a8271a1061d718ed3270f35c4d2d509a
+SHA1 (patch-libvalide_executable-manager_vala) = 6978f35afd77653a1021367fdb4186eb7423ef6d
+SHA1 (patch-libvalide_project-manager_vala) = f9b8a42b0238e29ae0bff926404d442bab2f39c0
+SHA1 (patch-libvalide_project_vala) = d6533071b8e649d19d1f5b625a1fac6cccdda8ee
+SHA1 (patch-libvalide_template_vala) = 7206d7b6716e6de55b2e1286ea02c4d7d9ffb052
+SHA1 (patch-libvalide_utils_vala) = 93b4aeb3351a210c81e712e1852635c4a7915481
diff --git a/devel/valide/hacks.mk b/devel/valide/hacks.mk
new file mode 100644
index 00000000000..babb4a78cea
--- /dev/null
+++ b/devel/valide/hacks.mk
@@ -0,0 +1,10 @@
+# $NetBSD: hacks.mk,v 1.1 2012/04/02 04:02:46 dholland Exp $
+
+# Apparently, what was ambitiously called "vala-1.0.pc" in some early release was
+# later retconned to "vala-0.10.pc", and thus now 0.12.
+#
+# Also, this package runs "valac" as "valac" rather than as "valac-0.12".
+
+post-wrapper:
+	ln -s ${LOCALBASE}/lib/pkgconfig/libvala-0.12.pc ${BUILDLINK_DIR}/lib/pkgconfig/vala-1.0.pc
+	ln -s ${VALAC} ${BUILDLINK_DIR}/bin/valac
diff --git a/devel/valide/patches/patch-libvalide_executable-manager_vala b/devel/valide/patches/patch-libvalide_executable-manager_vala
new file mode 100644
index 00000000000..bf9d1d1ea39
--- /dev/null
+++ b/devel/valide/patches/patch-libvalide_executable-manager_vala
@@ -0,0 +1,21 @@
+$NetBSD: patch-libvalide_executable-manager_vala,v 1.1 2012/04/02 04:02:46 dholland Exp $
+
+Fix escaping of regexes.
+
+--- libvalide/executable-manager.vala~	2009-03-08 13:09:49.000000000 +0000
++++ libvalide/executable-manager.vala
+@@ -99,10 +99,10 @@ public class Valide.ExecutableManager : 
+     if (str != "")
+     {
+       HashTable<string, string> pattern = new HashTable<string, string> (str_hash, str_equal);
+-      pattern.insert ("<i>(.*)</i>", "[i]\1[/i]");
+-      pattern.insert ("<b>(.*)</b>", "[b]\1[/b]");
+-      pattern.insert ("<span background=\"(.*)\">(.*)</span>", "[color=\"\1\"]\2[/color]");
+-      pattern.insert ("<span foreground=\"(.*)\">(.*)</span>", "[color=\"\1\"]\2[/color]");
++      pattern.insert ("<i>(.*)</i>", "[i]\\1[/i]");
++      pattern.insert ("<b>(.*)</b>", "[b]\\1[/b]");
++      pattern.insert ("<span background=\"(.*)\">(.*)</span>", "[color=\"\\1\"]\\2[/color]");
++      pattern.insert ("<span foreground=\"(.*)\">(.*)</span>", "[color=\"\\1\"]\\2[/color]");
+ 
+       foreach (string key in pattern.get_keys ())
+       {
diff --git a/devel/valide/patches/patch-libvalide_project-manager_vala b/devel/valide/patches/patch-libvalide_project-manager_vala
new file mode 100644
index 00000000000..de2829b06fa
--- /dev/null
+++ b/devel/valide/patches/patch-libvalide_project-manager_vala
@@ -0,0 +1,17 @@
+$NetBSD: patch-libvalide_project-manager_vala,v 1.1 2012/04/02 04:02:46 dholland Exp $
+
+Adjust for newer vala interfaces.
+
+--- libvalide/project-manager.vala.orig	2009-03-08 13:09:49.000000000 +0000
++++ libvalide/project-manager.vala
+@@ -54,8 +54,8 @@ public class Valide.ProjectManager : Gtk
+ 
+     // Transform XML
+     Xml.Doc* xml = Xml.Parser.parse_file (template.filename);
+-    Xml.XPathContext xpath = new Xml.XPathContext (xml);
+-    Xml.XPathObject* xpath_obj = xpath.eval ("/template");
++    Xml.XPath.Context xpath = new Xml.XPath.Context (xml);
++    Xml.XPath.Object* xpath_obj = xpath.eval ("/template");
+     xpath_obj->nodesetval->item (0)->name = "project";
+ 
+     xpath_obj = xpath.eval ("/project/description");
diff --git a/devel/valide/patches/patch-libvalide_project_vala b/devel/valide/patches/patch-libvalide_project_vala
new file mode 100644
index 00000000000..1ee4537e8b9
--- /dev/null
+++ b/devel/valide/patches/patch-libvalide_project_vala
@@ -0,0 +1,33 @@
+$NetBSD: patch-libvalide_project_vala,v 1.1 2012/04/02 04:02:46 dholland Exp $
+
+Adjust for newer vala interfaces.
+
+--- libvalide/project.vala.orig	2009-03-09 21:38:22.000000000 +0000
++++ libvalide/project.vala
+@@ -129,7 +129,7 @@ public class Valide.Project : Object
+     {
+       List<string> files_ = null;
+ 
+-      Xml.NodeSet* nodes = Markup.get_nodes (this.filename,
++      Xml.XPath.NodeSet* nodes = Markup.get_nodes (this.filename,
+                                              "/project/files/file/text ()");
+       for (int i = 0; i < nodes->length (); i++)
+       {
+@@ -335,7 +335,7 @@ public class Valide.Project : Object
+     {
+       List<string> pkg_ = null;
+ 
+-      Xml.NodeSet* nodes = Markup.get_nodes (this.filename,
++      Xml.XPath.NodeSet* nodes = Markup.get_nodes (this.filename,
+                                              "/project/compiler/pkg/text ()");
+       for (int i = 0; i < nodes->length (); i++)
+       {
+@@ -360,7 +360,7 @@ public class Valide.Project : Object
+     {
+       List<string> vapi_ = null;
+ 
+-      Xml.NodeSet* nodes = Markup.get_nodes (this.filename,
++      Xml.XPath.NodeSet* nodes = Markup.get_nodes (this.filename,
+                                              "/project/compiler/vapi/text ()");
+       for (int i = 0; i < nodes->length (); i++)
+       {
diff --git a/devel/valide/patches/patch-libvalide_template_vala b/devel/valide/patches/patch-libvalide_template_vala
new file mode 100644
index 00000000000..4dfd5f431e9
--- /dev/null
+++ b/devel/valide/patches/patch-libvalide_template_vala
@@ -0,0 +1,17 @@
+$NetBSD: patch-libvalide_template_vala,v 1.1 2012/04/02 04:02:46 dholland Exp $
+
+Adjust for newer vala interfaces.
+
+--- libvalide/template.vala.orig	2009-03-08 13:09:49.000000000 +0000
++++ libvalide/template.vala
+@@ -54,8 +54,8 @@ public class Valide.Template : Object
+       if (xml != null)
+       {
+         this.path = Path.get_dirname (this.filename);
+-        Xml.XPathContext xpath = new Xml.XPathContext (xml);
+-        Xml.XPathObject* xpath_obj = xpath.eval ("/template/files/file/text ()");
++        Xml.XPath.Context xpath = new Xml.XPath.Context (xml);
++        Xml.XPath.Object* xpath_obj = xpath.eval ("/template/files/file/text ()");
+         for (int i = 0; i < xpath_obj->nodesetval->length (); i++)
+         {
+           this._files.append (Path.build_filename (this.path,
diff --git a/devel/valide/patches/patch-libvalide_utils_vala b/devel/valide/patches/patch-libvalide_utils_vala
new file mode 100644
index 00000000000..22b8c6ab805
--- /dev/null
+++ b/devel/valide/patches/patch-libvalide_utils_vala
@@ -0,0 +1,65 @@
+$NetBSD: patch-libvalide_utils_vala,v 1.1 2012/04/02 04:02:46 dholland Exp $
+
+Adjust for newer vala interfaces.
+
+--- libvalide/utils.vala.orig	2009-03-08 13:09:49.000000000 +0000
++++ libvalide/utils.vala
+@@ -169,8 +169,8 @@ public class Valide.Markup
+   public static void remove (string filename, string xpath)
+   {
+     Xml.Doc* xml = Xml.Parser.parse_file (filename);
+-    Xml.XPathContext xpath_context = new Xml.XPathContext (xml);
+-    Xml.XPathObject* xpath_obj = xpath_context.eval (xpath);
++    Xml.XPath.Context xpath_context = new Xml.XPath.Context (xml);
++    Xml.XPath.Object* xpath_obj = xpath_context.eval (xpath);
+     for (int i = 0; i < xpath_obj->nodesetval->length (); i++)
+     {
+       xpath_obj->nodesetval->item (i)->unlink ();
+@@ -182,8 +182,8 @@ public class Valide.Markup
+                                 string? content=null)
+   {
+     Xml.Doc* xml = Xml.Parser.parse_file (filename);
+-    Xml.XPathContext xpath_context = new Xml.XPathContext (xml);
+-    Xml.XPathObject* xpath_obj = xpath_context.eval (xpath);
++    Xml.XPath.Context xpath_context = new Xml.XPath.Context (xml);
++    Xml.XPath.Object* xpath_obj = xpath_context.eval (xpath);
+     xpath_obj->nodesetval->item (0)->new_text_child (null, name, content);
+     Markup.save (filename, xml);
+   }
+@@ -193,8 +193,8 @@ public class Valide.Markup
+     bool ret = false;
+ 
+     Xml.Doc* xml = Xml.Parser.parse_file (filename);
+-    Xml.XPathContext xpath_context = new Xml.XPathContext (xml);
+-    Xml.XPathObject* xpath_obj = xpath_context.eval (xpath);
++    Xml.XPath.Context xpath_context = new Xml.XPath.Context (xml);
++    Xml.XPath.Object* xpath_obj = xpath_context.eval (xpath);
+     if (xpath_obj != null && xpath_obj->nodesetval->length () > 0)
+     {
+       ret = true;
+@@ -206,8 +206,8 @@ public class Valide.Markup
+   {
+     string ret = null;
+     Xml.Doc* xml = Xml.Parser.parse_file (filename);
+-    Xml.XPathContext xpath_context = new Xml.XPathContext (xml);
+-    Xml.XPathObject* xpath_obj = xpath_context.eval (xpath);
++    Xml.XPath.Context xpath_context = new Xml.XPath.Context (xml);
++    Xml.XPath.Object* xpath_obj = xpath_context.eval (xpath);
+     if (xpath_obj != null && xpath_obj->nodesetval->length () > 0)
+     {
+       ret = xpath_obj->nodesetval->item (0)->content;
+@@ -215,11 +215,11 @@ public class Valide.Markup
+     return ret;
+   }
+ 
+-  public static Xml.NodeSet* get_nodes (string filename, string xpath)
++  public static Xml.XPath.NodeSet* get_nodes (string filename, string xpath)
+   {
+     Xml.Doc* xml = Xml.Parser.parse_file (filename);
+-    Xml.XPathContext xpath_context = new Xml.XPathContext (xml);
+-    Xml.XPathObject* xpath_obj = xpath_context.eval (xpath);
++    Xml.XPath.Context xpath_context = new Xml.XPath.Context (xml);
++    Xml.XPath.Object* xpath_obj = xpath_context.eval (xpath);
+     return xpath_obj->nodesetval;
+   }
+ }