Presenting GNOME 2.20.1 and all related works for FreeBSD. The official

GNOME 2.20 release notes can be found at
http://www.gnome.org/start/2.20/notes/en/ .  Beyond that, this update
includes the new GIMP 2.4 (courtesy of ahze).

The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME
hierarchy.  We are now using the more standard DATADIR of ${PREFIX}/share
rather than ${PREFIX}/share/gnome. The result is that fewer patches and
hacks are needed to port GNOME components to FreeBSD.  This will mean some
user changes may be required, so be sure to read /usr/ports/UPDATING for
more details.

This release and the things we accomplished in it would not have been
possible without mezz's crazy idea to collapse DATADIR, and his persistence
to make it happen successfully.  Ahze and pav also deserve thanks for
their work on porting modules and testing the whole ball of wax on
pointyhat (respectively).

The FreeBSD GNOME team would also like to thank our various testers and
contributors:

Yasuda Keisuke
Frank Jahnke
Pawel Worach
Brian Gruber
Franz Klammer
Yuri Pankov
Nick Barkas
Cristian KLEIN
Tony Maher
Scot Hetzel
Martin Matuska (mm)
Benoit Dejean
Martin Wilke (miwi)
(And anyone else I may have missed)

PRs fixed in this release:

111272, 113470, 115995, 116338

3 files changed, 106 insertions, 64 deletions

diff --git a/lang/vala/Makefile b/lang/vala/Makefile
index 86688ad..e176ef4 100644
--- a/lang/vala/Makefile
+++ b/lang/vala/Makefile
@@ -3,11 +3,12 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/lang/vala/Makefile,v 1.1 2007/07/09 12:48:15 ahze Exp $
+#   $MCom: ports/lang/vala/Makefile,v 1.11 2007/10/22 21:01:35 ahze Exp $
+#
 
 PORTNAME=	vala
-PORTVERSION=	0.1.3
-PORTREVISION=	1
+PORTVERSION=	0.1.4
+PORTREVISION=	3
 CATEGORIES=	lang gnome
 MASTER_SITES=	GNOME
 
@@ -16,8 +17,9 @@ COMMENT=	Programming language and compiler that converts Vala code into C code
 
 LIB_DEPENDS=	enchant.1:${PORTSDIR}/textproc/enchant
 
+OPTIONS=	VAPIGEN "Enable VAPI generator" Off
 USE_BZIP2=	yes
-USE_GNOME=	glib20 gnomeprefix
+USE_GNOME=	glib20 gnomeprefix libxslt
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}" LDFLAGS="-L${LOCALBASE}/lib"
@@ -25,7 +27,20 @@ USE_BISON=	build
 MAN1=		valac.1
 USE_LDCONFIG=	yes
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_VAIPGEN)
+CONFIGURE_ARGS+=	--enable-vapigen
+BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML
+PLIST_SUB+=	VAPIGEN=""
+.else
+CONFIGURE_ARGS+=	--disable-vapigen
+PLIST_SUB+=	VAPIGEN="@comment "
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|$$(prefix)/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile.in
-.include <bsd.port.mk>
+
+.include <bsd.port.post.mk>
diff --git a/lang/vala/distinfo b/lang/vala/distinfo
index b5a650b..40d70a6 100644
--- a/lang/vala/distinfo
+++ b/lang/vala/distinfo
@@ -1,3 +1,3 @@
-MD5 (vala-0.1.3.tar.bz2) = d6552982b10582d0b01c3d612fb098b2
-SHA256 (vala-0.1.3.tar.bz2) = 02e6228dc689f67641d3739ee4e1559a8b90f9f9f2911a43cdc04f82cfd0bda5
-SIZE (vala-0.1.3.tar.bz2) = 905848
+MD5 (vala-0.1.4.tar.bz2) = f914a5d7d3a92d1cb6af69fb4bb98002
+SHA256 (vala-0.1.4.tar.bz2) = 3267e5b720abaff8faea7c2236500bd770d6c2b073e8bfe2ba84e58d51cf1bb1
+SIZE (vala-0.1.4.tar.bz2) = 955518
diff --git a/lang/vala/pkg-plist b/lang/vala/pkg-plist
index 4730846..4e2d743 100644
--- a/lang/vala/pkg-plist
+++ b/lang/vala/pkg-plist
@@ -1,4 +1,7 @@
+%%VAPIGEN%%bin/gidlgen
 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
@@ -60,18 +63,22 @@ 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/valaccodearraycreationexpressionbinding.h
+include/vala-1.0/gobject/valaccodeassignmentbinding.h
+include/vala-1.0/gobject/valaccodebinding.h
 include/vala-1.0/gobject/valaccodecompiler.h
+include/vala-1.0/gobject/valaccodeelementaccessbinding.h
+include/vala-1.0/gobject/valaccodeexpressionbinding.h
+include/vala-1.0/gobject/valaccodegenerator.h
+include/vala-1.0/gobject/valaccodegeneratorclass.h
+include/vala-1.0/gobject/valaccodegeneratorinterface.h
+include/vala-1.0/gobject/valaccodegeneratorinvocationexpression.h
+include/vala-1.0/gobject/valaccodegeneratormemberaccess.h
+include/vala-1.0/gobject/valaccodegeneratormethod.h
+include/vala-1.0/gobject/valaccodegeneratorsignal.h
+include/vala-1.0/gobject/valaccodegeneratorsourcefile.h
+include/vala-1.0/gobject/valaccodegeneratorstruct.h
 include/vala-1.0/gobject/valaclassregisterfunction.h
-include/vala-1.0/gobject/valacodegenerator.h
-include/vala-1.0/gobject/valacodegeneratorassignment.h
-include/vala-1.0/gobject/valacodegeneratorclass.h
-include/vala-1.0/gobject/valacodegeneratorinterface.h
-include/vala-1.0/gobject/valacodegeneratorinvocationexpression.h
-include/vala-1.0/gobject/valacodegeneratormemberaccess.h
-include/vala-1.0/gobject/valacodegeneratormethod.h
-include/vala-1.0/gobject/valacodegeneratorsignal.h
-include/vala-1.0/gobject/valacodegeneratorsourcefile.h
-include/vala-1.0/gobject/valacodegeneratorstruct.h
 include/vala-1.0/gobject/valadbusbindingprovider.h
 include/vala-1.0/gobject/valadbusmethod.h
 include/vala-1.0/gobject/valadbussignal.h
@@ -98,7 +105,9 @@ 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/valacodebinding.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/valaconditionalexpression.h
@@ -136,6 +145,7 @@ 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/valamemorymanager.h
 include/vala-1.0/vala/valamethod.h
 include/vala-1.0/vala/valanamedargument.h
@@ -181,53 +191,70 @@ include/vala-1.0/vala/valawhilestatement.h
 lib/libvala.la
 lib/libvala.so
 lib/libvala.so.0
+%%VAPIGEN%%lib/vala/gapi2xml.pl
+%%VAPIGEN%%lib/vala/gapi_pp.pl
 libdata/pkgconfig/vala-1.0.pc
-share/gnome/vala/vapi/atk.vala
-share/gnome/vala/vapi/cairo.vala
-share/gnome/vala/vapi/curses.vala
-share/gnome/vala/vapi/dbus-glib-1.vala
-share/gnome/vala/vapi/enchant.vala
-share/gnome/vala/vapi/gconf-2.0.vala
-share/gnome/vala/vapi/gdk-2.0.deps
-share/gnome/vala/vapi/gdk-2.0.vala
-share/gnome/vala/vapi/gio-standalone.vala
-share/gnome/vala/vapi/glib-2.0.vala
-share/gnome/vala/vapi/gnome-desktop-2.0.vala
-share/gnome/vala/vapi/gnome-vfs-2.0.vala
-share/gnome/vala/vapi/gstreamer-0.10.vala
-share/gnome/vala/vapi/gtk+-2.0.deps
-share/gnome/vala/vapi/gtk+-2.0.vala
-share/gnome/vala/vapi/gtkmozembed.deps
-share/gnome/vala/vapi/gtkmozembed.vala
-share/gnome/vala/vapi/gtksourceview-2.0.deps
-share/gnome/vala/vapi/gtksourceview-2.0.vala
-share/gnome/vala/vapi/hal.deps
-share/gnome/vala/vapi/hal.vala
-share/gnome/vala/vapi/hildon-1.deps
-share/gnome/vala/vapi/hildon-1.vala
-share/gnome/vala/vapi/libglade-2.0.deps
-share/gnome/vala/vapi/libglade-2.0.vala
-share/gnome/vala/vapi/libgnome-2.0.vala
-share/gnome/vala/vapi/libgnomeui-2.0.deps
-share/gnome/vala/vapi/libgnomeui-2.0.vala
-share/gnome/vala/vapi/libnotify.deps
-share/gnome/vala/vapi/libnotify.vala
-share/gnome/vala/vapi/libpanelapplet-2.0.deps
-share/gnome/vala/vapi/libpanelapplet-2.0.vala
-share/gnome/vala/vapi/libsoup-2.2.vala
-share/gnome/vala/vapi/libwnck-1.0.vala
-share/gnome/vala/vapi/libxml-2.0.vala
-share/gnome/vala/vapi/pango.deps
-share/gnome/vala/vapi/pango.vala
-share/gnome/vala/vapi/poppler-glib.deps
-share/gnome/vala/vapi/poppler-glib.vala
-share/gnome/vala/vapi/sqlite3.vala
-share/gnome/vala/vapi/vala-1.0.vala
-share/gnome/vala/vapi/vte.deps
-share/gnome/vala/vapi/vte.vala
-share/gnome/vala/vapi/zlib.vala
-@dirrm share/gnome/vala/vapi
-@dirrm share/gnome/vala
+share/devhelp/books/vala/classes.html
+share/devhelp/books/vala/default.css
+share/devhelp/books/vala/delegates.html
+share/devhelp/books/vala/enums.html
+share/devhelp/books/vala/expressions.html
+share/devhelp/books/vala/index.html
+share/devhelp/books/vala/interfaces.html
+share/devhelp/books/vala/namespaces.html
+share/devhelp/books/vala/overview.html
+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/atk.vapi
+%%DATADIR%%/vapi/cairo.vapi
+%%DATADIR%%/vapi/curses.vapi
+%%DATADIR%%/vapi/dbus-glib-1.vapi
+%%DATADIR%%/vapi/enchant.vapi
+%%DATADIR%%/vapi/gconf-2.0.vapi
+%%DATADIR%%/vapi/gdk-2.0.deps
+%%DATADIR%%/vapi/gdk-2.0.vapi
+%%DATADIR%%/vapi/gio-2.0.vapi
+%%DATADIR%%/vapi/glib-2.0.vapi
+%%DATADIR%%/vapi/gnome-desktop-2.0.vapi
+%%DATADIR%%/vapi/gnome-vfs-2.0.vapi
+%%DATADIR%%/vapi/gstreamer-0.10.vapi
+%%DATADIR%%/vapi/gtk+-2.0.deps
+%%DATADIR%%/vapi/gtk+-2.0.vapi
+%%DATADIR%%/vapi/gtkmozembed.deps
+%%DATADIR%%/vapi/gtkmozembed.vapi
+%%DATADIR%%/vapi/gtksourceview-2.0.deps
+%%DATADIR%%/vapi/gtksourceview-2.0.vapi
+%%DATADIR%%/vapi/hal.deps
+%%DATADIR%%/vapi/hal.vapi
+%%DATADIR%%/vapi/hildon-1.deps
+%%DATADIR%%/vapi/hildon-1.vapi
+%%DATADIR%%/vapi/libglade-2.0.deps
+%%DATADIR%%/vapi/libglade-2.0.vapi
+%%DATADIR%%/vapi/libgnome-2.0.vapi
+%%DATADIR%%/vapi/libgnomeui-2.0.deps
+%%DATADIR%%/vapi/libgnomeui-2.0.vapi
+%%DATADIR%%/vapi/libnotify.deps
+%%DATADIR%%/vapi/libnotify.vapi
+%%DATADIR%%/vapi/libpanelapplet-2.0.deps
+%%DATADIR%%/vapi/libpanelapplet-2.0.vapi
+%%DATADIR%%/vapi/libsoup-2.2.vapi
+%%DATADIR%%/vapi/libwnck-1.0.vapi
+%%DATADIR%%/vapi/libxml-2.0.vapi
+%%DATADIR%%/vapi/pango.deps
+%%DATADIR%%/vapi/pango.vapi
+%%DATADIR%%/vapi/poppler-glib.deps
+%%DATADIR%%/vapi/poppler-glib.vapi
+%%DATADIR%%/vapi/sqlite3.vapi
+%%DATADIR%%/vapi/vala-1.0.vapi
+%%DATADIR%%/vapi/vte.deps
+%%DATADIR%%/vapi/vte.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