Update to 0.1.10, initial diff from ajacoutot@

ok jasper@

graphics/babl/Makefile

@@ -1,14 +1,15 @@
-# $OpenBSD: Makefile,v 1.12 2011/12/10 09:12:19 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.13 2012/06/06 07:55:14 giovanni Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	dynamic pixel format conversion library
 
-V=		0.1.6
+API_VERSION=	0.1
+V=		${API_VERSION}.10
 DISTNAME=	babl-${V}
 CATEGORIES=	graphics devel
 
-SHARED_LIBS +=  babl-0.1             1.0      # 105.1
+SHARED_LIBS +=  babl-${API_VERSION}		1.0      # 105.1
 
 EXTRACT_SUFX=	.tar.bz2
 
@@ -28,19 +29,23 @@ WANTLIB=	m
 
 LIBTOOL_FLAGS=	--tag=disable-static
 
-BUILD_DEPENDS=	devel/gobject-introspection \
-		lang/vala
-
 USE_LIBTOOL=	Yes
 USE_GMAKE=	Yes
 
+SUBST_VARS=	API_VERSION
+
 CONFIGURE_STYLE=gnu
 CONFIGURE_ENV=	ac_cv_path_W3M=no \
 		ac_cv_path_RSVG=no
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--enable-introspection \
 		--disable-static
 
+# XXX https://bugzilla.gnome.org/show_bug.cgi?id=673580
+#BUILD_DEPENDS += lang/vala \
+#		devel/gobject-introspection
+CONFIGURE_ARGS += --without-vala \
+		--disable-introspection
+
 # be safe until proven stable
 CONFIGURE_ARGS+= --enable-mmx \
 		--disable-sse \

graphics/babl/distinfo

@@ -1,5 +1,5 @@
-MD5 (babl-0.1.6.tar.bz2) = 3JYJgaXsUzD8HBd76fWQaA==
-RMD160 (babl-0.1.6.tar.bz2) = afFJOQmtVxuJOFthY27Z9roW3YU=
-SHA1 (babl-0.1.6.tar.bz2) = MXjsn5iO/oldAOLUMq2bbsECEek=
-SHA256 (babl-0.1.6.tar.bz2) = MZuQBKU2YQH9Ui2gLMmDpdD1ChevD6XLzjU14xvOGaQ=
-SIZE (babl-0.1.6.tar.bz2) = 462712
+MD5 (babl-0.1.10.tar.bz2) = nhVCq1wLEuo68HapovAteQ==
+RMD160 (babl-0.1.10.tar.bz2) = oYtXvmks9f7ItmSWCdXY3bmpf4c=
+SHA1 (babl-0.1.10.tar.bz2) = 7mAIno6dk5DnMNOuXkEHRUmSi3o=
+SHA256 (babl-0.1.10.tar.bz2) = lD/DbOrH3SW8koJWvHtTWkKYnGuXFXgUaGnu5f5ZVfQ=
+SIZE (babl-0.1.10.tar.bz2) = 449537

graphics/babl/patches/patch-Makefile_in

@@ -1,14 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.6 2011/12/10 09:12:19 ajacoutot Exp $
---- Makefile.in.orig	Fri Nov 18 19:45:59 2011
-+++ Makefile.in	Sat Dec 10 08:58:46 2011
-@@ -292,9 +292,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
- DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
- SUBDIRS = \
- 	babl		\
--	extensions	\
--	tests		\
--	docs
-+	extensions
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = babl.pc

graphics/babl/patches/patch-babl_babl-palette_c

@@ -0,0 +1,23 @@
+$OpenBSD: patch-babl_babl-palette_c,v 1.1 2012/06/06 07:55:14 giovanni Exp $
+
+From 6075948c29306b9526c2a8e9e8cce65596c53a3c Mon Sep 17 00:00:00 2001
+From: Øyvind Kolås <pippin@gimp.org>
+Date: Thu, 05 Apr 2012 14:35:51 +0000
+Subject: babl/babl-palette.c: #include <limits.h>
+
+From ab6a85ccdeb2048053aa56e5c9003ffa7cceb1e1 Mon Sep 17 00:00:00 2001
+From: Øyvind Kolås <pippin@gimp.org>
+Date: Thu, 05 Apr 2012 14:39:15 +0000
+Subject: babl/babl-palette.c: remove include of <values.h>
+
+--- babl/babl-palette.c.orig	Fri Mar 30 01:10:26 2012
++++ babl/babl-palette.c	Thu Apr  5 17:00:14 2012
+@@ -19,7 +19,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdio.h>
+-#include <values.h>
++#include <limits.h>
+ #include <assert.h>
+ #include "config.h"
+ #include "babl-internal.h"

graphics/babl/patches/patch-extensions_Makefile_in

@@ -1,12 +0,0 @@
-$OpenBSD: patch-extensions_Makefile_in,v 1.6 2011/03/02 06:42:56 ajacoutot Exp $
---- extensions/Makefile.in.orig	Thu Jan 20 23:32:31 2011
-+++ extensions/Makefile.in	Tue Mar  1 17:33:21 2011
-@@ -195,7 +195,7 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
- LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
--LIBS = $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la $(MATH_LIB)
-+LIBS = $(MATH_LIB)
- LIBTOOL = @LIBTOOL@
- LIPO = @LIPO@
- LN_S = @LN_S@

graphics/babl/pkg/PLIST

@@ -1,33 +1,32 @@
-@comment $OpenBSD: PLIST,v 1.6 2011/12/10 09:12:19 ajacoutot Exp $
-include/babl-0.1/
-include/babl-0.1/babl/
-include/babl-0.1/babl/babl-macros.h
-include/babl-0.1/babl/babl-types.h
-include/babl-0.1/babl/babl-version.h
-include/babl-0.1/babl/babl.h
-lib/babl-0.1/
+@comment $OpenBSD: PLIST,v 1.7 2012/06/06 07:55:14 giovanni Exp $
+include/babl-${API_VERSION}/
+include/babl-${API_VERSION}/babl/
+include/babl-${API_VERSION}/babl/babl-macros.h
+include/babl-${API_VERSION}/babl/babl-types.h
+include/babl-${API_VERSION}/babl/babl-version.h
+include/babl-${API_VERSION}/babl/babl.h
+lib/babl-${API_VERSION}/
 @comment lib/babl-0.1/CIE.la
-lib/babl-0.1/CIE.so
+lib/babl-${API_VERSION}/CIE.so
+@comment lib/babl-0.1/cairo.la
+lib/babl-${API_VERSION}/cairo.so
+@comment lib/babl-0.1/fast-float.la
+lib/babl-${API_VERSION}/fast-float.so
+@comment lib/babl-0.1/float.la
+lib/babl-${API_VERSION}/float.so
 @comment lib/babl-0.1/gegl-fixups.la
-lib/babl-0.1/gegl-fixups.so
+lib/babl-${API_VERSION}/gegl-fixups.so
 @comment lib/babl-0.1/gggl-lies.la
-lib/babl-0.1/gggl-lies.so
+lib/babl-${API_VERSION}/gggl-lies.so
 @comment lib/babl-0.1/gggl.la
-lib/babl-0.1/gggl.so
+lib/babl-${API_VERSION}/gggl.so
 @comment lib/babl-0.1/gimp-8bit.la
-lib/babl-0.1/gimp-8bit.so
+lib/babl-${API_VERSION}/gimp-8bit.so
 @comment lib/babl-0.1/naive-CMYK.la
-lib/babl-0.1/naive-CMYK.so
+lib/babl-${API_VERSION}/naive-CMYK.so
 @comment lib/babl-0.1/sse-fixups.la
-lib/babl-0.1/sse-fixups.so
-lib/girepository-1.0/
-lib/girepository-1.0/Babl-0.1.typelib
-lib/libbabl-0.1.la
-@lib lib/libbabl-0.1.so.${LIBbabl-0.1_VERSION}
+lib/babl-${API_VERSION}/sse-fixups.so
+lib/libbabl-${API_VERSION}.la
+@lib lib/libbabl-${API_VERSION}.so.${LIBbabl-0.1_VERSION}
 lib/pkgconfig/
 lib/pkgconfig/babl.pc
-share/gir-1.0/
-share/gir-1.0/Babl-0.1.gir
-share/vala/
-share/vala/vapi/
-share/vala/vapi/babl-0.1.vapi