Presenting GNOME 2.32.1 for FreeBSD. The offical release notes for this

release can be found at http://library.gnome.org/misc/release-notes/2.32/

This will be the last release of the GNOME 2.x series, mainly a bugfix and
bridge release to the first release of the GNOME 3.x series.

This release features commits by avl, marcus, mezz and myself.

The FreeBSD GNOME Team would like to thank the following contributors and
testers for there help with this release:

Zane C.B. <vvelox@vvelox.net>
romain@
Olaf Seibert <O.Seibert@cs.ru.nl>
DomiX
Bapt <baptiste.daroussin@gmail.com>
jsa@
miwi@
Sergio de Almeida Lenzi <lenzi.sergio@gmail.com>
Maxim Samsonov <xors@mne.ru>
Kris Moore

And pav@ for 2 exp-runs

PR:		ports/152255
		ports/143260
		ports/141033
		ports/149629
		ports/150350
		ports/151523
With hat:	gnome@

1 files changed, 33 insertions, 11 deletions

diff --git a/lang/vala/Makefile b/lang/vala/Makefile
index ea97811facd7..aafdbadef607 100644
--- a/lang/vala/Makefile
+++ b/lang/vala/Makefile
@@ -3,44 +3,66 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/lang/vala/Makefile,v 1.32 2010/04/21 22:30:45 kwm Exp $
+#   $MCom: ports/lang/vala/Makefile,v 1.46 2010/10/27 21:21:51 kwm Exp $
 #
 
 PORTNAME=	vala
-PORTVERSION=	0.8.1
-PORTREVISION=	1
+PORTVERSION=	0.10.1
 CATEGORIES=	lang gnome
 MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Programming language and compiler that converts Vala code into C code
 
-OPTIONS=	VAPIGEN "Enable VAPI generator" Off
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING
 USE_BZIP2=	yes
-USE_GNOME=	glib20 gnomeprefix libxslt
+USE_GNOME=	gnomehack glib20 gnomeprefix libxslt
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}" LDFLAGS="-L${LOCALBASE}/lib"
 USE_BISON=	build
 USE_LDCONFIG=	yes
 
-MAN1=		valac.1
+MAN1?=		valac.1 valac-0.10.1
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_VAPIGEN)
+.if defined(VALA_SLAVE)
+LIB_DEPENDS+=	vala-0.10.0:${PORTSDIR}/lang/vala
 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
-MAN1+=		vala-gen-introspect.1 vapigen.1
-PLIST_SUB+=	VAPIGEN=""
+MAN1=		vala-gen-introspect.1 vapigen.1
 .else
 CONFIGURE_ARGS+=--disable-vapigen
-PLIST_SUB+=	VAPIGEN="@comment "
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|$$(prefix)/libdata/pkgconfig|' \
+# We cheat here, because vala records vapigen related stuff in its .pc file
+# This makes the vapigen work again, although it might get weird when
+# vala-vapigen isn't installed.
+	@${REINPLACE_CMD} -e 's|@vapigen_decl@|vapigen=$${bindir}/vapigen-0.10|g' \
+		-e 's|@gen_introspect_decl@|gen_introspect=$${libdir}/vala-0.10/gen-introspect-0.10|g' \
+		-e 's|@vala_gen_introspect_decl@|vala_gen_introspect=$${bindir}/vala-gen-introspect-0.10|g' \
+		${WRKSRC}/vala.pc.in
+	@${REINPLACE_CMD} -e 's|cp $$< $$@|cp vala.pc vala-0.10.pc|g' \
 		${WRKSRC}/Makefile.in
 
+.if defined(VALA_SLAVE)
+pre-build:
+	@cd ${WRKSRC} && ${GMAKE} version.h
+	@cd ${WRKSRC}/gobject-introspection && ${GMAKE} libgidl.la && \
+		${GMAKE} gen-introspect
+
+post-install:
+	@cd ${WRKSRC}/gobject-introspection && ${GMAKE} install
+	@${INSTALL_MAN} ${WRKSRC}/doc/vapigen.1 ${WRKSRC}/doc/vala-gen-introspect.1 \
+		 ${PREFIX}/man/man1/
+.else
+post-install:
+	${LN} -fs ${PREFIX}/libdata/pkgconfig/vala-0.10.pc \
+		${PREFIX}/libdata/pkgconfig/vala-1.0.pc
+.endif
+
 .include <bsd.port.post.mk>