Presenting GNOME 2.28.1 for FreeBSD. The official release notes for this

release can be found at http://library.gnome.org/misc/release-notes/2.28/ .
Officially, this is mostly a polishing release in preparation for GNOME 3.0
due in about a year.

On the FreeBSD front, though, a lot went into this release.  Major thanks
goes to kwm and avl who did a lot of the porting work for this release.
In particular, kwm brought in Evolution MAPI support for better Microsoft
Exchange integration.  Avl made sure that the new gobject introspection
repository ports were nicely compartmentalized so that large dependencies
aren't brought in wholesale.

But, every GNOME team member (ahze, avl, bland, kwm, mezz, and myself)
contributed to this release.

Other major improvements include an updated HAL with better volume
probing code, ufsid integration, and support for volume names containing
spaces (big thanks to J.R. Oldroyd); a new WebKit; updated AbiWord;
an updated Gimp; and a preview of the new GNOME Shell project (thanks to
Pawel Worach).

The FreeBSD GNOME Team would like to that the following additional
contributors to this release whose patches and testing really helped
make it a success:

Andrius Morkunas
Dominique Goncalves
Eric L. Chen
J.R. Oldroyd
Joseph S. Atkinson
Li
Pawel Worach
Romain Tartière
Thomas Vogt
Yasuda Keisuke
Rui Paulo
Martin Wilke
(and an extra shout out to miwi and pav for pointyhat runs)

We would like to send this release out to Alexander Loginov (avl) in
hopes that he feels better soon.

PR:		136676
		136967
		138872 (obsolete with new epiphany-webkit)
		139160
		134737
		139941
		140097
		140838
		140929

8 files changed, 149 insertions, 234 deletions

diff --git a/lang/Makefile b/lang/Makefile
index 7b25b966b9f8..8e54f6b35d1e 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -96,6 +96,7 @@
     SUBDIR += gdc
     SUBDIR += gforth
     SUBDIR += ghc
+    SUBDIR += gjs
     SUBDIR += gnat
     SUBDIR += gnat-doc-html
     SUBDIR += gnat-doc-info
diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile
new file mode 100644
index 000000000000..606e2ec70f98
--- /dev/null
+++ b/lang/gjs/Makefile
@@ -0,0 +1,36 @@
+# New ports collection makefile for:   gjs
+# Date created:        14 Aug 2009
+# Whom:                Pawel Worach <pawel.worach@gmail.com>
+#
+# $FreeBSD$
+#   $MCom: ports/lang/gjs/Makefile,v 1.2 2009/08/27 16:02:10 kwm Exp $
+#
+
+PORTNAME=	gjs
+PORTVERSION=	0.4
+CATEGORIES=	lang gnome
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	GNOME Javascript binding
+
+BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+
+USE_GECKO=	libxul
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
+USE_PYTHON=	build
+USE_AUTOTOOLS=	libtool:22
+USE_GNOME=	gnomeprefix gnomehack intlhack glib20 ltverhack
+USE_LDCONFIG=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+post-patch:
+	${REINPLACE_CMD} -e 's|/usr/bin/python|/usr/bin/env python|g' \
+		${WRKSRC}/scripts/make-tests
+
+.include <bsd.port.mk>
diff --git a/lang/gjs/distinfo b/lang/gjs/distinfo
new file mode 100644
index 000000000000..a3a0e979a38e
--- /dev/null
+++ b/lang/gjs/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/gjs-0.4.tar.bz2) = 584594b22e433d56d660a7dda650809d
+SHA256 (gnome2/gjs-0.4.tar.bz2) = 78c3116cfb0feba08c79b4beea4b6ef16bfca3be9b59efcfa7e6eca79911aca6
+SIZE (gnome2/gjs-0.4.tar.bz2) = 401868
diff --git a/lang/gjs/pkg-descr b/lang/gjs/pkg-descr
new file mode 100644
index 000000000000..5b4871abcb68
--- /dev/null
+++ b/lang/gjs/pkg-descr
@@ -0,0 +1,3 @@
+JavaScript bindings based on gobject-introspection.
+
+WWW: http://live.gnome.org/Gjs
diff --git a/lang/gjs/pkg-plist b/lang/gjs/pkg-plist
new file mode 100644
index 000000000000..47c9e7359ffe
--- /dev/null
+++ b/lang/gjs/pkg-plist
@@ -0,0 +1,70 @@
+bin/gjs
+bin/gjs-console
+include/gjs-1.0/gjs-dbus/dbus-proxy.h
+include/gjs-1.0/gjs-dbus/dbus.h
+include/gjs-1.0/gjs/context.h
+include/gjs-1.0/gjs/gi/arg.h
+include/gjs-1.0/gjs/gi/boxed.h
+include/gjs-1.0/gjs/gi/closure.h
+include/gjs-1.0/gjs/gi/enumeration.h
+include/gjs-1.0/gjs/gi/function.h
+include/gjs-1.0/gjs/gi/keep-alive.h
+include/gjs-1.0/gjs/gi/ns.h
+include/gjs-1.0/gjs/gi/object.h
+include/gjs-1.0/gjs/gi/param.h
+include/gjs-1.0/gjs/gi/repo.h
+include/gjs-1.0/gjs/gi/union.h
+include/gjs-1.0/gjs/gi/value.h
+include/gjs-1.0/gjs/gjs.h
+include/gjs-1.0/gjs/importer.h
+include/gjs-1.0/gjs/jsapi-util.h
+include/gjs-1.0/gjs/mem.h
+include/gjs-1.0/gjs/native.h
+lib/gjs-1.0/console.a
+lib/gjs-1.0/console.la
+lib/gjs-1.0/console.so
+lib/gjs-1.0/dbusNative.a
+lib/gjs-1.0/dbusNative.la
+lib/gjs-1.0/dbusNative.so
+lib/gjs-1.0/debugger.a
+lib/gjs-1.0/debugger.la
+lib/gjs-1.0/debugger.so
+lib/gjs-1.0/gettextNative.a
+lib/gjs-1.0/gettextNative.la
+lib/gjs-1.0/gettextNative.so
+lib/gjs-1.0/gi.a
+lib/gjs-1.0/gi.la
+lib/gjs-1.0/gi.so
+lib/gjs-1.0/mainloop.a
+lib/gjs-1.0/mainloop.la
+lib/gjs-1.0/mainloop.so
+lib/libgjs-dbus.a
+lib/libgjs-dbus.la
+lib/libgjs-dbus.so
+lib/libgjs-dbus.so.0
+lib/libgjs-gi.a
+lib/libgjs-gi.la
+lib/libgjs-gi.so
+lib/libgjs-gi.so.0
+lib/libgjs.a
+lib/libgjs.la
+lib/libgjs.so
+lib/libgjs.so.0
+libdata/pkgconfig/gjs-1.0.pc
+libdata/pkgconfig/gjs-dbus-1.0.pc
+libdata/pkgconfig/gjs-gi-1.0.pc
+share/gjs-1.0/dbus.js
+share/gjs-1.0/gettext.js
+share/gjs-1.0/jsUnit.js
+share/gjs-1.0/lang.js
+share/gjs-1.0/signals.js
+share/gjs-1.0/tweener/equations.js
+share/gjs-1.0/tweener/tweenList.js
+share/gjs-1.0/tweener/tweener.js
+@dirrm share/gjs-1.0/tweener
+@dirrm share/gjs-1.0
+@dirrm lib/gjs-1.0
+@dirrm include/gjs-1.0/gjs/gi
+@dirrm include/gjs-1.0/gjs
+@dirrm include/gjs-1.0/gjs-dbus
+@dirrm include/gjs-1.0
diff --git a/lang/vala/Makefile b/lang/vala/Makefile
index 1e83f7244413..b8780de86193 100644
--- a/lang/vala/Makefile
+++ b/lang/vala/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/lang/vala/Makefile,v 1.23 2009/03/31 14:27:07 kwm Exp $
+#   $MCom: ports/lang/vala/Makefile,v 1.29 2009/11/26 21:21:05 marcus Exp $
 #
 
 PORTNAME=	vala
-PORTVERSION=	0.6.1
+PORTVERSION=	0.7.8
 CATEGORIES=	lang gnome
 MASTER_SITES=	GNOME
 
diff --git a/lang/vala/distinfo b/lang/vala/distinfo
index cbf419051c97..cdc36e141b1e 100644
--- a/lang/vala/distinfo
+++ b/lang/vala/distinfo
@@ -1,3 +1,3 @@
-MD5 (vala-0.6.1.tar.bz2) = 592009ea10fa35ebb6bd472bb4198654
-SHA256 (vala-0.6.1.tar.bz2) = 601a6eaa30c9bec41fd3aa470e01f4d2734a6b330ca01a2dd688bd67d517c33f
-SIZE (vala-0.6.1.tar.bz2) = 1595689
+MD5 (vala-0.7.8.tar.bz2) = accd0d350c6d6de7527a0a65c40f8be2
+SHA256 (vala-0.7.8.tar.bz2) = b2daf636d95ef66ffd5132eacf18335073b71bfaa18f7ad06f25bcf9673aa747
+SIZE (vala-0.7.8.tar.bz2) = 1949627
diff --git a/lang/vala/pkg-plist b/lang/vala/pkg-plist
index 1b9041854eeb..b45e17f66c0e 100644
--- a/lang/vala/pkg-plist
+++ b/lang/vala/pkg-plist
@@ -2,235 +2,15 @@
 bin/valac
 %%VAPIGEN%%bin/vapicheck
 %%VAPIGEN%%bin/vapigen
-include/vala-1.0/ccode/valaccodeassignment.h
-include/vala-1.0/ccode/valaccodebinaryexpression.h
-include/vala-1.0/ccode/valaccodeblock.h
-include/vala-1.0/ccode/valaccodebreakstatement.h
-include/vala-1.0/ccode/valaccodecasestatement.h
-include/vala-1.0/ccode/valaccodecastexpression.h
-include/vala-1.0/ccode/valaccodecommaexpression.h
-include/vala-1.0/ccode/valaccodecomment.h
-include/vala-1.0/ccode/valaccodeconditionalexpression.h
-include/vala-1.0/ccode/valaccodeconstant.h
-include/vala-1.0/ccode/valaccodecontinuestatement.h
-include/vala-1.0/ccode/valaccodedeclaration.h
-include/vala-1.0/ccode/valaccodedeclarator.h
-include/vala-1.0/ccode/valaccodedostatement.h
-include/vala-1.0/ccode/valaccodeelementaccess.h
-include/vala-1.0/ccode/valaccodeemptystatement.h
-include/vala-1.0/ccode/valaccodeenum.h
-include/vala-1.0/ccode/valaccodeenumvalue.h
-include/vala-1.0/ccode/valaccodeexpression.h
-include/vala-1.0/ccode/valaccodeexpressionstatement.h
-include/vala-1.0/ccode/valaccodeformalparameter.h
-include/vala-1.0/ccode/valaccodeforstatement.h
-include/vala-1.0/ccode/valaccodefragment.h
-include/vala-1.0/ccode/valaccodefunction.h
-include/vala-1.0/ccode/valaccodefunctioncall.h
-include/vala-1.0/ccode/valaccodefunctiondeclarator.h
-include/vala-1.0/ccode/valaccodegotostatement.h
-include/vala-1.0/ccode/valaccodeidentifier.h
-include/vala-1.0/ccode/valaccodeifstatement.h
-include/vala-1.0/ccode/valaccodeincludedirective.h
-include/vala-1.0/ccode/valaccodeinitializerlist.h
-include/vala-1.0/ccode/valaccodelabel.h
-include/vala-1.0/ccode/valaccodelinedirective.h
-include/vala-1.0/ccode/valaccodemacroreplacement.h
-include/vala-1.0/ccode/valaccodememberaccess.h
-include/vala-1.0/ccode/valaccodemodifiers.h
-include/vala-1.0/ccode/valaccodenewline.h
-include/vala-1.0/ccode/valaccodenode.h
-include/vala-1.0/ccode/valaccodeoncesection.h
-include/vala-1.0/ccode/valaccodeparenthesizedexpression.h
-include/vala-1.0/ccode/valaccodereturnstatement.h
-include/vala-1.0/ccode/valaccodestatement.h
-include/vala-1.0/ccode/valaccodestruct.h
-include/vala-1.0/ccode/valaccodeswitchstatement.h
-include/vala-1.0/ccode/valaccodetypedefinition.h
-include/vala-1.0/ccode/valaccodeunaryexpression.h
-include/vala-1.0/ccode/valaccodevariabledeclarator.h
-include/vala-1.0/ccode/valaccodewhilestatement.h
-include/vala-1.0/ccode/valaccodewriter.h
-include/vala-1.0/gee/arraylist.h
-include/vala-1.0/gee/collection.h
-include/vala-1.0/gee/collectionobject.h
-include/vala-1.0/gee/hashmap.h
-include/vala-1.0/gee/hashset.h
-include/vala-1.0/gee/iterable.h
-include/vala-1.0/gee/iterator.h
-include/vala-1.0/gee/list.h
-include/vala-1.0/gee/map.h
-include/vala-1.0/gee/readonlycollection.h
-include/vala-1.0/gee/readonlylist.h
-include/vala-1.0/gee/readonlymap.h
-include/vala-1.0/gee/readonlyset.h
-include/vala-1.0/gee/set.h
-include/vala-1.0/gobject/valaccodearraymodule.h
-include/vala-1.0/gobject/valaccodeassignmentmodule.h
-include/vala-1.0/gobject/valaccodebasemodule.h
-include/vala-1.0/gobject/valaccodecompiler.h
-include/vala-1.0/gobject/valaccodecontrolflowmodule.h
-include/vala-1.0/gobject/valaccodedeclarationspace.h
-include/vala-1.0/gobject/valaccodedelegatemodule.h
-include/vala-1.0/gobject/valaccodegenerator.h
-include/vala-1.0/gobject/valaccodememberaccessmodule.h
-include/vala-1.0/gobject/valaccodemethodcallmodule.h
-include/vala-1.0/gobject/valaccodemethodmodule.h
-include/vala-1.0/gobject/valaccodemodule.h
-include/vala-1.0/gobject/valaccodestructmodule.h
-include/vala-1.0/gobject/valaclassregisterfunction.h
-include/vala-1.0/gobject/valadbusclientmodule.h
-include/vala-1.0/gobject/valadbusmodule.h
-include/vala-1.0/gobject/valadbusservermodule.h
-include/vala-1.0/gobject/valagasyncmodule.h
-include/vala-1.0/gobject/valagerrormodule.h
-include/vala-1.0/gobject/valagirwriter.h
-include/vala-1.0/gobject/valagobjectmodule.h
-include/vala-1.0/gobject/valagsignalmodule.h
-include/vala-1.0/gobject/valagtypemodule.h
-include/vala-1.0/gobject/valainterfaceregisterfunction.h
-include/vala-1.0/gobject/valastructregisterfunction.h
-include/vala-1.0/gobject/valatyperegisterfunction.h
-include/vala-1.0/vala/valaaddressofexpression.h
-include/vala-1.0/vala/valaarraycreationexpression.h
-include/vala-1.0/vala/valaarraylengthfield.h
-include/vala-1.0/vala/valaarraymovemethod.h
-include/vala-1.0/vala/valaarrayresizemethod.h
-include/vala-1.0/vala/valaarraytype.h
-include/vala-1.0/vala/valaassignment.h
-include/vala-1.0/vala/valaattribute.h
-include/vala-1.0/vala/valabaseaccess.h
-include/vala-1.0/vala/valabasicblock.h
-include/vala-1.0/vala/valabinaryexpression.h
-include/vala-1.0/vala/valablock.h
-include/vala-1.0/vala/valabooleanliteral.h
-include/vala-1.0/vala/valabooleantype.h
-include/vala-1.0/vala/valabreakstatement.h
-include/vala-1.0/vala/valacastexpression.h
-include/vala-1.0/vala/valacatchclause.h
-include/vala-1.0/vala/valacharacterliteral.h
-include/vala-1.0/vala/valaclass.h
-include/vala-1.0/vala/valaclasstype.h
-include/vala-1.0/vala/valacodecontext.h
-include/vala-1.0/vala/valacodegenerator.h
-include/vala-1.0/vala/valacodenode.h
-include/vala-1.0/vala/valacodevisitor.h
-include/vala-1.0/vala/valacodewriter.h
-include/vala-1.0/vala/valaconditionalexpression.h
-include/vala-1.0/vala/valaconstant.h
-include/vala-1.0/vala/valaconstructor.h
-include/vala-1.0/vala/valacontinuestatement.h
-include/vala-1.0/vala/valacreationmethod.h
-include/vala-1.0/vala/valadatatype.h
-include/vala-1.0/vala/valadeclarationstatement.h
-include/vala-1.0/vala/valadelegate.h
-include/vala-1.0/vala/valadelegatetype.h
-include/vala-1.0/vala/valadeletestatement.h
-include/vala-1.0/vala/valadestructor.h
-include/vala-1.0/vala/valadostatement.h
-include/vala-1.0/vala/valadynamicmethod.h
-include/vala-1.0/vala/valadynamicproperty.h
-include/vala-1.0/vala/valadynamicsignal.h
-include/vala-1.0/vala/valaelementaccess.h
-include/vala-1.0/vala/valaemptystatement.h
-include/vala-1.0/vala/valaenum.h
-include/vala-1.0/vala/valaenumvalue.h
-include/vala-1.0/vala/valaenumvaluetype.h
-include/vala-1.0/vala/valaerrorcode.h
-include/vala-1.0/vala/valaerrordomain.h
-include/vala-1.0/vala/valaerrortype.h
-include/vala-1.0/vala/valaexpression.h
-include/vala-1.0/vala/valaexpressionstatement.h
-include/vala-1.0/vala/valafield.h
-include/vala-1.0/vala/valafieldprototype.h
-include/vala-1.0/vala/valafloatingtype.h
-include/vala-1.0/vala/valaflowanalyzer.h
-include/vala-1.0/vala/valaforeachstatement.h
-include/vala-1.0/vala/valaformalparameter.h
-include/vala-1.0/vala/valaforstatement.h
-include/vala-1.0/vala/valagenieparser.h
-include/vala-1.0/vala/valageniescanner.h
-include/vala-1.0/vala/valagenietokentype.h
-include/vala-1.0/vala/valagenerictype.h
-include/vala-1.0/vala/valaifstatement.h
-include/vala-1.0/vala/valainitializerlist.h
-include/vala-1.0/vala/valainstancecast.h
-include/vala-1.0/vala/valaintegerliteral.h
-include/vala-1.0/vala/valaintegertype.h
-include/vala-1.0/vala/valainterface.h
-include/vala-1.0/vala/valainterfacetype.h
-include/vala-1.0/vala/valainvalidtype.h
-include/vala-1.0/vala/valalambdaexpression.h
-include/vala-1.0/vala/valaliteral.h
-include/vala-1.0/vala/valalocalvariable.h
-include/vala-1.0/vala/valalockable.h
-include/vala-1.0/vala/valalockstatement.h
-include/vala-1.0/vala/valamember.h
-include/vala-1.0/vala/valamemberaccess.h
-include/vala-1.0/vala/valamemberinitializer.h
-include/vala-1.0/vala/valamethod.h
-include/vala-1.0/vala/valamethodcall.h
-include/vala-1.0/vala/valamethodtype.h
-include/vala-1.0/vala/valanamespace.h
-include/vala-1.0/vala/valanullchecker.h
-include/vala-1.0/vala/valanullliteral.h
-include/vala-1.0/vala/valanulltype.h
-include/vala-1.0/vala/valaobjectcreationexpression.h
-include/vala-1.0/vala/valaobjecttype.h
-include/vala-1.0/vala/valaobjecttypesymbol.h
-include/vala-1.0/vala/valaparser.h
-include/vala-1.0/vala/valaphifunction.h
-include/vala-1.0/vala/valapointerindirection.h
-include/vala-1.0/vala/valapointertype.h
-include/vala-1.0/vala/valapostfixexpression.h
-include/vala-1.0/vala/valaproperty.h
-include/vala-1.0/vala/valapropertyaccessor.h
-include/vala-1.0/vala/valarealliteral.h
-include/vala-1.0/vala/valareferencetransferexpression.h
-include/vala-1.0/vala/valareferencetype.h
-include/vala-1.0/vala/valareport.h
-include/vala-1.0/vala/valareturnstatement.h
-include/vala-1.0/vala/valascanner.h
-include/vala-1.0/vala/valascope.h
-include/vala-1.0/vala/valasemanticanalyzer.h
-include/vala-1.0/vala/valasignal.h
-include/vala-1.0/vala/valasignaltype.h
-include/vala-1.0/vala/valasizeofexpression.h
-include/vala-1.0/vala/valasourcefile.h
-include/vala-1.0/vala/valasourcefilecycle.h
-include/vala-1.0/vala/valasourcelocation.h
-include/vala-1.0/vala/valasourcereference.h
-include/vala-1.0/vala/valastatement.h
-include/vala-1.0/vala/valastatementlist.h
-include/vala-1.0/vala/valastringliteral.h
-include/vala-1.0/vala/valastruct.h
-include/vala-1.0/vala/valastructvaluetype.h
-include/vala-1.0/vala/valaswitchlabel.h
-include/vala-1.0/vala/valaswitchsection.h
-include/vala-1.0/vala/valaswitchstatement.h
-include/vala-1.0/vala/valasymbol.h
-include/vala-1.0/vala/valasymbolresolver.h
-include/vala-1.0/vala/valathrowstatement.h
-include/vala-1.0/vala/valatokentype.h
-include/vala-1.0/vala/valatrystatement.h
-include/vala-1.0/vala/valatuple.h
-include/vala-1.0/vala/valatypecheck.h
-include/vala-1.0/vala/valatypeofexpression.h
-include/vala-1.0/vala/valatypeparameter.h
-include/vala-1.0/vala/valatypesymbol.h
-include/vala-1.0/vala/valaunaryexpression.h
-include/vala-1.0/vala/valaunresolvedsymbol.h
-include/vala-1.0/vala/valaunresolvedtype.h
-include/vala-1.0/vala/valausingdirective.h
-include/vala-1.0/vala/valavaluetype.h
-include/vala-1.0/vala/valavoidtype.h
-include/vala-1.0/vala/valawhilestatement.h
-include/vala-1.0/vala/valayieldstatement.h
+include/vala-1.0/vala.h
+include/vala-1.0/valaccode.h
+include/vala-1.0/valacodegen.h
+include/vala-1.0/valagee.h
 lib/libvala.la
 lib/libvala.so
 lib/libvala.so.0
-libdata/pkgconfig/vala-1.0.pc
 %%VAPIGEN%%lib/vala/gen-introspect
+libdata/pkgconfig/vala-1.0.pc
 share/devhelp/books/vala/attributes.html
 share/devhelp/books/vala/classes.html
 share/devhelp/books/vala/default.css
@@ -247,11 +27,20 @@ share/devhelp/books/vala/statements.html
 share/devhelp/books/vala/structs.html
 share/devhelp/books/vala/types.html
 share/devhelp/books/vala/vala.devhelp2
+%%DATADIR%%/vapi/alsa.vapi
 %%DATADIR%%/vapi/atk.vapi
 %%DATADIR%%/vapi/bzlib.vapi
+%%DATADIR%%/vapi/cairo-xcb.deps
+%%DATADIR%%/vapi/cairo-xcb.vapi
 %%DATADIR%%/vapi/cairo.vapi
+%%DATADIR%%/vapi/clutter-1.0.deps
+%%DATADIR%%/vapi/clutter-1.0.vapi
+%%DATADIR%%/vapi/clutter-json-1.0.vapi
+%%DATADIR%%/vapi/cogl-1.0.deps
+%%DATADIR%%/vapi/cogl-1.0.vapi
 %%DATADIR%%/vapi/curses.vapi
 %%DATADIR%%/vapi/dbus-glib-1.vapi
+%%DATADIR%%/vapi/dconf.vapi
 %%DATADIR%%/vapi/enchant.vapi
 %%DATADIR%%/vapi/fuse.deps
 %%DATADIR%%/vapi/fuse.vapi
@@ -265,13 +54,16 @@ share/devhelp/books/vala/vala.devhelp2
 %%DATADIR%%/vapi/gio-2.0.vapi
 %%DATADIR%%/vapi/gio-unix-2.0.deps
 %%DATADIR%%/vapi/gio-unix-2.0.vapi
+%%DATADIR%%/vapi/gl-1.0.vapi
 %%DATADIR%%/vapi/glib-2.0.vapi
 %%DATADIR%%/vapi/gmodule-2.0.vapi
+%%DATADIR%%/vapi/gnet-2.0.deps
 %%DATADIR%%/vapi/gnet-2.0.vapi
 %%DATADIR%%/vapi/gnome-desktop-2.0.deps
 %%DATADIR%%/vapi/gnome-desktop-2.0.vapi
 %%DATADIR%%/vapi/gnome-keyring-1.vapi
 %%DATADIR%%/vapi/gnome-vfs-2.0.vapi
+%%DATADIR%%/vapi/gnutls.vapi
 %%DATADIR%%/vapi/gobject-2.0.vapi
 %%DATADIR%%/vapi/goocanvas.deps
 %%DATADIR%%/vapi/goocanvas.vapi
@@ -328,6 +120,10 @@ share/devhelp/books/vala/vala.devhelp2
 %%DATADIR%%/vapi/libepc-1.0.vapi
 %%DATADIR%%/vapi/libftdi.deps
 %%DATADIR%%/vapi/libftdi.vapi
+%%DATADIR%%/vapi/libgda-4.0.deps
+%%DATADIR%%/vapi/libgda-4.0.vapi
+%%DATADIR%%/vapi/libgdata.deps
+%%DATADIR%%/vapi/libgdata.vapi
 %%DATADIR%%/vapi/libglade-2.0.deps
 %%DATADIR%%/vapi/libglade-2.0.vapi
 %%DATADIR%%/vapi/libgnome-2.0.vapi
@@ -336,12 +132,14 @@ share/devhelp/books/vala/vala.devhelp2
 %%DATADIR%%/vapi/libgnomeui-2.0.vapi
 %%DATADIR%%/vapi/libgsf-1.deps
 %%DATADIR%%/vapi/libgsf-1.vapi
+%%DATADIR%%/vapi/libnl-1.vapi
 %%DATADIR%%/vapi/libnotify.deps
 %%DATADIR%%/vapi/libnotify.vapi
 %%DATADIR%%/vapi/liboobs-1.vapi
 %%DATADIR%%/vapi/libosso.vapi
 %%DATADIR%%/vapi/libpanelapplet-2.0.deps
 %%DATADIR%%/vapi/libpanelapplet-2.0.vapi
+%%DATADIR%%/vapi/libpq.vapi
 %%DATADIR%%/vapi/librsvg-2.0.deps
 %%DATADIR%%/vapi/librsvg-2.0.vapi
 %%DATADIR%%/vapi/libsexy.deps
@@ -349,10 +147,14 @@ share/devhelp/books/vala/vala.devhelp2
 %%DATADIR%%/vapi/libsoup-2.2.vapi
 %%DATADIR%%/vapi/libsoup-2.4.deps
 %%DATADIR%%/vapi/libsoup-2.4.vapi
+%%DATADIR%%/vapi/libusb-1.0.deps
+%%DATADIR%%/vapi/libusb-1.0.vapi
 %%DATADIR%%/vapi/libusb.vapi
 %%DATADIR%%/vapi/libwnck-1.0.deps
 %%DATADIR%%/vapi/libwnck-1.0.vapi
 %%DATADIR%%/vapi/libxml-2.0.vapi
+%%DATADIR%%/vapi/linux.deps
+%%DATADIR%%/vapi/linux.vapi
 %%DATADIR%%/vapi/loudmouth-1.0.vapi
 %%DATADIR%%/vapi/lua.vapi
 %%DATADIR%%/vapi/mysql.vapi
@@ -365,6 +167,8 @@ share/devhelp/books/vala/vala.devhelp2
 %%DATADIR%%/vapi/posix.vapi
 %%DATADIR%%/vapi/raptor.vapi
 %%DATADIR%%/vapi/rasqal.vapi
+%%DATADIR%%/vapi/rest.deps
+%%DATADIR%%/vapi/rest.vapi
 %%DATADIR%%/vapi/sdl-gfx.vapi
 %%DATADIR%%/vapi/sdl-image.vapi
 %%DATADIR%%/vapi/sdl-mixer.vapi
@@ -383,13 +187,11 @@ share/devhelp/books/vala/vala.devhelp2
 %%DATADIR%%/vapi/vte.vapi
 %%DATADIR%%/vapi/webkit-1.0.deps
 %%DATADIR%%/vapi/webkit-1.0.vapi
+%%DATADIR%%/vapi/x11.vapi
+%%DATADIR%%/vapi/xcb.vapi
 %%DATADIR%%/vapi/zlib.vapi
 @dirrm share/devhelp/books/vala
 @dirrmtry share/devhelp/books
 @dirrmtry share/devhelp
 %%VAPIGEN%%@dirrm lib/vala
-@dirrm include/vala-1.0/vala
-@dirrm include/vala-1.0/gobject
-@dirrm include/vala-1.0/gee
-@dirrm include/vala-1.0/ccode
 @dirrm include/vala-1.0