From fcf2696b88c7373b62c734516d2c86bbc6badc81 Mon Sep 17 00:00:00 2001 From: gls Date: Wed, 10 Nov 2010 21:45:45 +0000 Subject: Make sure books are installed in the proper place. While here, re-add libxslt build depend. Bump PKGREVISION. --- lang/vala/Makefile | 11 ++++++++++- lang/vala/PLIST | 45 +++++++++++++++++---------------------------- lang/vala/distinfo | 4 +++- lang/vala/patches/patch-aa | 15 +++++++++++++++ lang/vala/patches/patch-ab | 12 ++++++++++++ 5 files changed, 57 insertions(+), 30 deletions(-) create mode 100644 lang/vala/patches/patch-aa create mode 100644 lang/vala/patches/patch-ab (limited to 'lang') diff --git a/lang/vala/Makefile b/lang/vala/Makefile index 406143c1fe8..d9847268323 100644 --- a/lang/vala/Makefile +++ b/lang/vala/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2010/11/06 15:02:56 gls Exp $ +# $NetBSD: Makefile,v 1.11 2010/11/10 21:45:45 gls Exp $ # DISTNAME= vala-0.10.1 +PKGREVISION= 1 CATEGORIES= lang gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/vala/0.10/} EXTRACT_SUFX= .tar.bz2 @@ -20,9 +21,16 @@ USE_TOOLS+= bison flex gmake pkg-config PKGCONFIG_OVERRIDE+= libvala.pc.in BUILDLINK_API_DEPENDS.glib2+= glib2>=2.16.0 +BUILDLINK_DEPMETHOD.libxslt= build INSTALLATION_DIRS= share/doc/vala +SUBST_CLASSES+= bookdir +SUBST_STAGE.bookdir= post-patch +SUBST_MESSAGE.bookdir= Fixing doc path +SUBST_FILES.bookdir= doc/vala/Makefile.in doc/vala/Makefile.am +SUBST_SED.bookdir= -e 's,@@BOOKDIR@@,${PREFIX}/share/doc/vala/devhelp/books,' + post-install: .for file in AUTHORS COPYING ChangeLog ChangeLog.pre-0-4 ChangeLog.pre-0-5-7 INSTALL MAINTAINERS NEWS README THANKS ${INSTALL_DATA} ${WRKSRC}/${file} \ @@ -32,4 +40,5 @@ post-install: .include "options.mk" .include "../../devel/glib2/buildlink3.mk" +.include "../../textproc/libxslt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/vala/PLIST b/lang/vala/PLIST index 9b3366cb786..b255a84f004 100644 --- a/lang/vala/PLIST +++ b/lang/vala/PLIST @@ -1,44 +1,17 @@ -@comment $NetBSD: PLIST,v 1.6 2010/11/06 15:02:56 gls Exp $ +@comment $NetBSD: PLIST,v 1.7 2010/11/10 21:45:46 gls Exp $ bin/vala bin/vala-0.10 -bin/vala-gen-introspect -bin/vala-gen-introspect-0.10 bin/valac bin/valac-0.10 -bin/vapicheck -bin/vapicheck-0.10 -bin/vapigen -bin/vapigen-0.10 include/vala-0.10/vala.h include/vala-0.10/valaccode.h include/vala-0.10/valacodegen.h include/vala-0.10/valagee.h lib/libvala-0.10.la lib/pkgconfig/vala-0.10.pc -lib/vala-0.10/gen-introspect-0.10 -man/man1/vala-gen-introspect-0.10.1 -man/man1/vala-gen-introspect.1 man/man1/valac-0.10.1 man/man1/valac.1 -man/man1/vapigen-0.10.1 -man/man1/vapigen.1 share/aclocal/vala.m4 -share/devhelp/books/vala-0.10/attributes.html -share/devhelp/books/vala-0.10/classes.html -share/devhelp/books/vala-0.10/default.css -share/devhelp/books/vala-0.10/delegates.html -share/devhelp/books/vala-0.10/enums.html -share/devhelp/books/vala-0.10/exceptions.html -share/devhelp/books/vala-0.10/expressions.html -share/devhelp/books/vala-0.10/index.html -share/devhelp/books/vala-0.10/interfaces.html -share/devhelp/books/vala-0.10/methods.html -share/devhelp/books/vala-0.10/namespaces.html -share/devhelp/books/vala-0.10/overview.html -share/devhelp/books/vala-0.10/statements.html -share/devhelp/books/vala-0.10/structs.html -share/devhelp/books/vala-0.10/types.html -share/devhelp/books/vala-0.10/vala.devhelp2 share/doc/vala/AUTHORS share/doc/vala/COPYING share/doc/vala/ChangeLog @@ -49,6 +22,22 @@ share/doc/vala/MAINTAINERS share/doc/vala/NEWS share/doc/vala/README share/doc/vala/THANKS +share/doc/vala/devhelp/books/attributes.html +share/doc/vala/devhelp/books/classes.html +share/doc/vala/devhelp/books/default.css +share/doc/vala/devhelp/books/delegates.html +share/doc/vala/devhelp/books/enums.html +share/doc/vala/devhelp/books/exceptions.html +share/doc/vala/devhelp/books/expressions.html +share/doc/vala/devhelp/books/index.html +share/doc/vala/devhelp/books/interfaces.html +share/doc/vala/devhelp/books/methods.html +share/doc/vala/devhelp/books/namespaces.html +share/doc/vala/devhelp/books/overview.html +share/doc/vala/devhelp/books/statements.html +share/doc/vala/devhelp/books/structs.html +share/doc/vala/devhelp/books/types.html +share/doc/vala/devhelp/books/vala.devhelp2 share/vala-0.10/vapi/alsa.vapi share/vala-0.10/vapi/atk.vapi share/vala-0.10/vapi/avahi-gobject.deps diff --git a/lang/vala/distinfo b/lang/vala/distinfo index 8e2623a20f6..aac59ac7cef 100644 --- a/lang/vala/distinfo +++ b/lang/vala/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.5 2010/11/06 15:02:56 gls Exp $ +$NetBSD: distinfo,v 1.6 2010/11/10 21:45:46 gls Exp $ SHA1 (vala-0.10.1.tar.bz2) = cef8bb4646d5b6d52b7817d725c40e685f1b3a86 RMD160 (vala-0.10.1.tar.bz2) = 796eac9564761f32a9ddf1e2b62ba52f3138fef4 Size (vala-0.10.1.tar.bz2) = 2415883 bytes +SHA1 (patch-aa) = 8f774dc60b2ccc6472012ec67441c27c15022c90 +SHA1 (patch-ab) = 16d641dfae3895314c9e946a4d0a48791c02196b diff --git a/lang/vala/patches/patch-aa b/lang/vala/patches/patch-aa new file mode 100644 index 00000000000..4f35464ef2c --- /dev/null +++ b/lang/vala/patches/patch-aa @@ -0,0 +1,15 @@ +$NetBSD: patch-aa,v 1.1 2010/11/10 21:45:46 gls Exp $ + +--- doc/vala/Makefile.in.orig 2010-10-26 18:18:05.000000000 +0000 ++++ doc/vala/Makefile.in +@@ -215,8 +215,8 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + vala_gen_introspect_decl = @vala_gen_introspect_decl@ + vapigen_decl = @vapigen_decl@ +-NULL = +-bookdir = $(datadir)/devhelp/books/vala@PACKAGE_SUFFIX@ ++NULL = ++bookdir = @@BOOKDIR@@ + chapter_data = \ + overview.html \ + types.html \ diff --git a/lang/vala/patches/patch-ab b/lang/vala/patches/patch-ab new file mode 100644 index 00000000000..88446b26a86 --- /dev/null +++ b/lang/vala/patches/patch-ab @@ -0,0 +1,12 @@ +$NetBSD: patch-ab,v 1.1 2010/11/10 21:45:46 gls Exp $ + +--- doc/vala/Makefile.am.orig 2010-09-10 07:35:01.000000000 +0000 ++++ doc/vala/Makefile.am +@@ -1,6 +1,6 @@ + NULL = + +-bookdir=$(datadir)/devhelp/books/vala@PACKAGE_SUFFIX@ ++bookdir=@@BOOKDIR@@ + + chapter_data = \ + overview.html \ -- cgit v1.2.3