>Number: 186780
>Category: ports
>Synopsis: [UPDATE] lang/vala to 0.22.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Feb 14 22:30:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Olivier Duchateau
>Release:
>Organization:
>Environment:
>Description:
- Update to 0.22.1
- Adjust dependencies
- Support STAGEDIR
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
--- Makefile (révision 344317)
+++ Makefile (copie de travail)
@@ -3,7 +3,7 @@
# $MCom: ports/trunk/lang/vala/Makefile 18634 2013-07-26 10:42:35Z kwm $
PORTNAME= vala
-PORTVERSION= 0.20.1
+PORTVERSION= 0.22.1
CATEGORIES= lang gnome
MASTER_SITES= GNOME
@@ -12,30 +12,27 @@
LICENSE= LGPL21
-USES= bison gettext gmake pathfix pkgconfig
+USES= bison gmake pathfix pkgconfig libtool
USE_XZ= yes
-USE_GNOME= glib20 gnomeprefix libxslt
+USE_GNOME= glib20 libxslt introspection:build
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
-MAN1?= valac.1 valac-${VALA_VER}.1
VALA_VER= ${PORTVERSION:R}
PLIST_SUB= VERSION=${VALA_VER}
.if defined(VALA_SLAVE)
-LIB_DEPENDS+= vala-${VALA_VER}.0:${PORTSDIR}/lang/vala
+LIB_DEPENDS+= libvala-${VALA_VER}.so:${PORTSDIR}/lang/vala
CONFIGURE_ARGS+=--enable-vapigen
BUILD_DEPENDS+= p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML
RUN_DEPENDS+= p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML
-MAN1= vala-gen-introspect.1 vapigen.1
.else
CONFIGURE_ARGS+=--disable-vapigen
.endif
-NO_STAGE= yes
post-patch:
# We cheat here, because vala records vapigen related stuff in its .pc file
# This makes vapigen work again, although it might get weird when
@@ -49,18 +46,28 @@
.if defined(VALA_SLAVE)
pre-build:
- @cd ${WRKSRC} && ${GMAKE} version.h
- @cd ${WRKSRC}/gobject-introspection && ${GMAKE} libgidl.la && \
- ${GMAKE} gen-introspect
+ @(cd ${WRKSRC} && ${GMAKE} version.h)
+ @(cd ${WRKSRC}/gobject-introspection && ${GMAKE} all)
+ @(cd ${WRKSRC}/vapigen && ${GMAKE} all)
+
+do-install:
+ @(cd ${WRKSRC}/gobject-introspection && ${SETENV} ${MAKE_ENV} \
+ ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} \
+ ${INSTALL_TARGET})
+ @(cd ${WRKSRC}/vapigen && ${SETENV} ${MAKE_ENV} \
+ ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} \
+ ${INSTALL_TARGET})
post-install:
- @cd ${WRKSRC}/gobject-introspection && ${GMAKE} install
- @${INSTALL_MAN} ${WRKSRC}/doc/vapigen.1 ${WRKSRC}/doc/vala-gen-introspect.1 \
- ${PREFIX}/man/man1/
+.for f in vapigen.1 vala-gen-introspect.1
+ @${INSTALL_MAN} ${WRKSRC}/doc/${f} \
+ ${STAGEDIR}${PREFIX}/man/man1
+.endfor
.else
post-install:
- ${LN} -fs ${PREFIX}/libdata/pkgconfig/libvala-${VALA_VER}.pc \
- ${PREFIX}/libdata/pkgconfig/vala-1.0.pc
+ @${LN} -fs ${PREFIX}/libdata/pkgconfig/libvala-${VALA_VER}.pc \
+ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libvala.pc
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libvala-*.so
.endif
.include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo (révision 344317)
+++ distinfo (copie de travail)
@@ -1,2 +1,2 @@
-SHA256 (vala-0.20.1.tar.xz) = 9cb7ecd18a23525e401c204d4d08341c7d911cd5d78078eee10b747ecb45e481
-SIZE (vala-0.20.1.tar.xz) = 2627808
+SHA256 (vala-0.22.1.tar.xz) = 92c61b94a427f281ba2537b69135a3be23248b153268057d7195003dd6aba28c
+SIZE (vala-0.22.1.tar.xz) = 2690324
Index: pkg-plist
===================================================================
--- pkg-plist (révision 344317)
+++ pkg-plist (copie de travail)
@@ -9,8 +9,11 @@
lib/libvala-%%VERSION%%.la
lib/libvala-%%VERSION%%.so
lib/libvala-%%VERSION%%.so.0
+lib/libvala-%%VERSION%%.so.0.0.0
libdata/pkgconfig/libvala-%%VERSION%%.pc
-libdata/pkgconfig/vala-1.0.pc
+libdata/pkgconfig/libvala.pc
+man/man1/valac-%%VERSION%%.1.gz
+man/man1/valac.1.gz
share/aclocal/vala.m4
share/devhelp/books/vala-%%VERSION%%/attributes.html
share/devhelp/books/vala-%%VERSION%%/classes.html
@@ -59,6 +62,8 @@
%%DATADIR%%-%%VERSION%%/vapi/enchant.vapi
%%DATADIR%%-%%VERSION%%/vapi/fuse.deps
%%DATADIR%%-%%VERSION%%/vapi/fuse.vapi
+%%DATADIR%%-%%VERSION%%/vapi/geocode-glib-1.0.deps
+%%DATADIR%%-%%VERSION%%/vapi/geocode-glib-1.0.vapi
%%DATADIR%%-%%VERSION%%/vapi/gconf-2.0.vapi
%%DATADIR%%-%%VERSION%%/vapi/gdk-2.0.deps
%%DATADIR%%-%%VERSION%%/vapi/gdk-2.0.vapi
>Release-Note:
>Audit-Trail:
>Unformatted: