-install only parts which are qualified by a version number, to allow

 parallel installation with other versions
-don't install documentation - this will be done by the newest
 stable version
-drop the "vapigen" option, this was not worth the effort
bump PKGREV

8 files changed, 32 insertions, 106 deletions

diff --git a/lang/vala/Makefile b/lang/vala/Makefile
index 72808d239bf..4ffa6baa6b3 100644
--- a/lang/vala/Makefile
+++ b/lang/vala/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2012/02/06 12:40:47 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2012/02/09 19:54:41 drochner Exp $
 #
 
 DISTNAME=	vala-0.12.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	lang gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/vala/0.12/}
 EXTRACT_SUFX=	.tar.bz2
@@ -15,30 +15,14 @@ LICENSE=	gnu-lgpl-v2.1
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+= --enable-vapigen
+CONFIGURE_ARGS+= --disable-unversioned
 USE_LIBTOOL=	yes
 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} \
-		${DESTDIR}${PREFIX}/share/doc/vala
-.endfor
-
-.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 504384c0387..94edd46202d 100644
--- a/lang/vala/PLIST
+++ b/lang/vala/PLIST
@@ -1,43 +1,16 @@
-@comment $NetBSD: PLIST,v 1.11 2011/06/09 11:10:41 drochner Exp $
-bin/vala
+@comment $NetBSD: PLIST,v 1.12 2012/02/09 19:54:42 drochner Exp $
 bin/vala-0.12
-bin/valac
+bin/vala-gen-introspect-0.12
 bin/valac-0.12
+bin/vapicheck-0.12
+bin/vapigen-0.12
 include/vala-0.12/vala.h
 include/vala-0.12/valaccode.h
 include/vala-0.12/valacodegen.h
 include/vala-0.12/valagee.h
 lib/libvala-0.12.la
 lib/pkgconfig/libvala-0.12.pc
-man/man1/valac-0.12.1
-man/man1/valac.1
-share/aclocal/vala.m4
-share/doc/vala/AUTHORS
-share/doc/vala/COPYING
-share/doc/vala/ChangeLog
-share/doc/vala/ChangeLog.pre-0-4
-share/doc/vala/ChangeLog.pre-0-5-7
-share/doc/vala/INSTALL
-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
+lib/vala-0.12/gen-introspect-0.12
 share/vala-0.12/vapi/alsa.deps
 share/vala-0.12/vapi/alsa.vapi
 share/vala-0.12/vapi/atk.vapi
diff --git a/lang/vala/PLIST.vapigen b/lang/vala/PLIST.vapigen
deleted file mode 100644
index 221ce705242..00000000000
--- a/lang/vala/PLIST.vapigen
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST.vapigen,v 1.6 2011/04/05 17:52:10 drochner Exp $
-bin/vala-gen-introspect
-bin/vala-gen-introspect-0.12
-bin/vapicheck
-bin/vapicheck-0.12
-bin/vapigen
-bin/vapigen-0.12
-lib/vala-0.12/gen-introspect-0.12
-man/man1/vala-gen-introspect-0.12.1
-man/man1/vala-gen-introspect.1
-man/man1/vapigen-0.12.1
-man/man1/vapigen.1
diff --git a/lang/vala/distinfo b/lang/vala/distinfo
index d36448a079c..0fdc06cf29e 100644
--- a/lang/vala/distinfo
+++ b/lang/vala/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.13 2011/06/09 11:10:41 drochner Exp $
+$NetBSD: distinfo,v 1.14 2012/02/09 19:54:42 drochner Exp $
 
 SHA1 (vala-0.12.1.tar.bz2) = defa61ac7b9f97abe8aac7ad7fb3f80f3c0b9657
 RMD160 (vala-0.12.1.tar.bz2) = 97e45e254ca3718e2cbaff70da6e692c6cb20717
 Size (vala-0.12.1.tar.bz2) = 2863125 bytes
-SHA1 (patch-aa) = 8f774dc60b2ccc6472012ec67441c27c15022c90
-SHA1 (patch-ab) = 16d641dfae3895314c9e946a4d0a48791c02196b
+SHA1 (patch-ac) = 40a47e058cb53edf41e862b1a818a2c1901e30a0
diff --git a/lang/vala/options.mk b/lang/vala/options.mk
deleted file mode 100644
index 47aafc05f61..00000000000
--- a/lang/vala/options.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2009/03/21 18:03:42 ahoka Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.vala
-PKG_SUPPORTED_OPTIONS+=	vapigen
-PKG_SUGGESTED_OPTIONS+=	vapigen
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mvapigen)
-CONFIGURE_ARGS+=	--enable-vapigen
-PLIST_SRC+=		PLIST PLIST.vapigen
-.endif
diff --git a/lang/vala/patches/patch-aa b/lang/vala/patches/patch-aa
deleted file mode 100644
index 4f35464ef2c..00000000000
--- a/lang/vala/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index 88446b26a86..00000000000
--- a/lang/vala/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$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 \
diff --git a/lang/vala/patches/patch-ac b/lang/vala/patches/patch-ac
new file mode 100644
index 00000000000..b037b0cf259
--- /dev/null
+++ b/lang/vala/patches/patch-ac
@@ -0,0 +1,21 @@
+$NetBSD: patch-ac,v 1.1 2012/02/09 19:54:42 drochner Exp $
+
+--- Makefile.in.orig	2011-06-01 14:37:56.000000000 +0000
++++ Makefile.in
+@@ -288,7 +288,6 @@ SUBDIRS = \
+ 	compiler \
+ 	vapi \
+ 	tests \
+-	doc \
+ 	$(VAPIGEN_SUBDIRS) \
+ 	$(NULL)
+ 
+@@ -805,7 +804,7 @@ info: info-recursive
+ 
+ info-am:
+ 
+-install-data-am: install-dist_aclocalDATA install-pkgconfigDATA
++install-data-am: install-pkgconfigDATA
+ 
+ install-dvi: install-dvi-recursive
+