summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2010-07-24 06:08:46 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2010-07-24 06:08:46 +0800
commit141a80f7bf2d1fca55971878a4e656c1beb82351 (patch)
tree15f75433220afbc83b8402793c33a24f13031ec4
parente6f684c42545fadb64072691fd4a3561eefcf566 (diff)
downloadmarcuscom-ports-141a80f7bf2d1fca55971878a4e656c1beb82351.tar
marcuscom-ports-141a80f7bf2d1fca55971878a4e656c1beb82351.tar.gz
marcuscom-ports-141a80f7bf2d1fca55971878a4e656c1beb82351.tar.bz2
marcuscom-ports-141a80f7bf2d1fca55971878a4e656c1beb82351.tar.lz
marcuscom-ports-141a80f7bf2d1fca55971878a4e656c1beb82351.tar.xz
marcuscom-ports-141a80f7bf2d1fca55971878a4e656c1beb82351.tar.zst
marcuscom-ports-141a80f7bf2d1fca55971878a4e656c1beb82351.zip
Use USE_GNOME=gnomehack instead of custom post-patch line.
Add LICENSE. When vala is build with vapigen support it adds some things to its .pc file. Since vapigen is a slave port, cheat and add the lines anyway. This might get some wierd results when vala-vapigen isn't installed. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14363 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--lang/vala/Makefile14
1 files changed, 10 insertions, 4 deletions
diff --git a/lang/vala/Makefile b/lang/vala/Makefile
index b9586f7cf..f512e4a27 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.35 2010/07/13 08:02:07 kwm Exp $
+# $MCom: ports/lang/vala/Makefile,v 1.36 2010/07/15 14:58:18 kwm Exp $
#
PORTNAME= vala
PORTVERSION= 0.9.3
+PORTREVISION= 1
CATEGORIES= lang gnome
MASTER_SITES= GNOME
@@ -17,7 +18,7 @@ COMMENT= Programming language and compiler that converts Vala code into C code
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"
@@ -39,8 +40,13 @@ CONFIGURE_ARGS+=--disable-vapigen
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|$$(prefix)/libdata/pkgconfig|' \
- ${WRKSRC}/Makefile.in
+# 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|g' \
+ -e 's|@gen_introspect_decl@|gen_introspect=$${libdir}/vala/gen-introspect|g' \
+ -e 's|@vala_gen_introspect_decl@|vala_gen_introspect=$${bindir}/vala-gen-introspect|g' \
+ ${WRKSRC}/vala-1.0.pc.in
.if defined(VALA_SLAVE)
pre-build: