Unbreak with new vala.

graphics/birdfont/Makefile

@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2014/03/26 09:15:34 ajacoutot Exp $
-
-BROKEN=		does not build with new vala
+# $OpenBSD: Makefile,v 1.4 2014/03/26 09:23:33 ajacoutot Exp $
 
 COMMENT =	free font editor for TTF, EOT, and SVG fonts
 DISTNAME =	birdfont-0.31
@@ -44,7 +42,7 @@ CONFIGURE_STYLE =	simple
 NO_TEST =	Yes
 SUBST_VARS +=	DESTDIR
 
-post-patch:
+pre-configure:
 	perl -pi -e "s,bash,sh,g" ${WRKSRC}/*.sh ${WRKSRC}/scripts/run.py
 	${SUBST_CMD} ${WRKSRC}/configure ${WRKSRC}/install.py ${WRKSRC}/dodo.py ${WRKSRC}/scripts/bavala.py
 

graphics/birdfont/patches/patch-dodo_py

@@ -1,6 +1,9 @@
-$OpenBSD: patch-dodo_py,v 1.1 2013/09/13 07:09:36 bcallah Exp $
---- dodo.py.orig	Sun Aug 25 15:36:42 2013
-+++ dodo.py	Sun Aug 25 15:37:13 2013
+$OpenBSD: patch-dodo_py,v 1.2 2014/03/26 09:23:33 ajacoutot Exp $
+
+glib-2.0.vapi:967.53-967.68: error: Access to instance member `length' from nullable reference denied
+
+--- dodo.py.orig	Thu Sep 12 15:33:31 2013
++++ dodo.py	Wed Mar 26 10:19:22 2014
 @@ -45,7 +45,7 @@ LIBS = [
      'cairo',
      'gdk-pixbuf-2.0',
@@ -10,7 +13,12 @@ $OpenBSD: patch-dodo_py,v 1.1 2013/09/13 07:09:36 bcallah Exp $
      ]
  
  def task_build ():
-@@ -78,7 +78,7 @@ valac_options = [
+@@ -73,12 +73,11 @@ def task_pkg_flags():
+ 
+ 
+ valac_options = [
+-	'--enable-experimental-non-null',
+ 	'--enable-experimental',
  	'--target-glib=2.34', # see bug 0000004
  	'--define=LINUX'
  	]

graphics/birdfont/patches/patch-scripts_build_py

@@ -0,0 +1,30 @@
+$OpenBSD: patch-scripts_build_py,v 1.1 2014/03/26 09:23:33 ajacoutot Exp $
+
+glib-2.0.vapi:967.53-967.68: error: Access to instance member `length' from nullable reference denied
+
+--- scripts/build.py.orig	Wed Mar 26 10:19:55 2014
++++ scripts/build.py	Wed Mar 26 10:20:02 2014
+@@ -31,7 +31,6 @@ def libbirdfont(prefix, cc, cflags, ldflags, valac, va
+ 		-C \
+ 		""" + valaflags + """ \
+ 		--basedir build/libbirdfont/ \
+-		--enable-experimental-non-null \
+ 		--enable-experimental \
+ 		--library libbirdfont \
+ 		-H build/libbirdfont/birdfont.h \
+@@ -89,7 +88,6 @@ def birdfont_export(prefix, cc, cflags, ldflags, valac
+ 	
+ 	run(valac + """ \
+ 		-C \
+-		--enable-experimental-non-null \
+ 		--enable-experimental \
+ 		--define=MAC birdfont-export/* \
+ 		--vapidir=./ \
+@@ -135,7 +133,6 @@ def birdfont_gtk(prefix, cc, cflags, ldflags, valac, v
+ 	run(valac + " " + valaflags  + """\
+ 		-C \
+ 		birdfont/* \
+-		--enable-experimental-non-null \
+ 		--enable-experimental \
+ 		--vapidir=./ \
+ 		--pkg gee-1.0 \