Update to 0.1.10

Convert to OtionsNG, switch to pathfix from gnomehack.

PR:		ports/172157
Sumbitted by:	Oliver Hartmann <ohartman@zedat.fu-berlin.de>
Obtained from:	gnome team repo

4 files changed, 33 insertions, 15 deletions

diff --git a/x11/babl/Makefile b/x11/babl/Makefile
index a76ffe6d5516..f80b523e2f09 100644
--- a/x11/babl/Makefile
+++ b/x11/babl/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	babl
-PORTVERSION=	0.1.6
+PORTVERSION=	0.1.10
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		http://gimp.mirrors.hoobly.com/%SUBDIR%/ \
@@ -16,21 +16,20 @@ MASTER_SITE_SUBDIR=	babl/${PORTVERSION:R}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Dynamic pixel format conversion library
 
-BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack ltverhack
+USE_GNOME=	ltverhack
 USE_PKGCONFIG=	build
+USES=		pathfix
 USE_GMAKE=	yes
-MAKE_JOBS_UNSAFE=yes
+CONFIGURE_ARGS=	--disable-introspection
 
-OPTIONS=	SIMD "Use cpu-specific optimizations if available" off
+OPTIONS_DEFINE=	SIMD
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_SIMD)
+.if ${PORT_OPTIONS:MSIMD}
 CONFIGURE_ARGS+=--disable-mmx \
 		--disable-sse \
 		--disable-altivec
@@ -40,4 +39,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|x86_64|amd64|g' \
 		${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/babl/distinfo b/x11/babl/distinfo
index b940cf88b2b9..1e82a6896c31 100644
--- a/x11/babl/distinfo
+++ b/x11/babl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (babl-0.1.6.tar.bz2) = 319b9004a5366101fd522da02cc983a5d0f50a17af0fa5cbce3535e31bce19a4
-SIZE (babl-0.1.6.tar.bz2) = 462712
+SHA256 (babl-0.1.10.tar.bz2) = 943fc36ceac7dd25bc928256bc7b535a42989c6b971578146869eee5fe5955f4
+SIZE (babl-0.1.10.tar.bz2) = 449537
diff --git a/x11/babl/files/patch-babl_babl-palette.c b/x11/babl/files/patch-babl_babl-palette.c
new file mode 100644
index 000000000000..842991f0c011
--- /dev/null
+++ b/x11/babl/files/patch-babl_babl-palette.c
@@ -0,0 +1,14 @@
+--- babl/babl-palette.c.orig	2012-05-04 12:44:48.000000000 +0200
++++ babl/babl-palette.c	2012-05-04 12:47:11.000000000 +0200
+@@ -19,8 +19,11 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdio.h>
++#ifdef __linux__
+ #include <values.h>
++#endif
+ #include <assert.h>
++#include <sys/limits.h>
+ #include "config.h"
+ #include "babl-internal.h"
+ #include "babl.h"
diff --git a/x11/babl/pkg-plist b/x11/babl/pkg-plist
index 134e901007bc..b661262d0734 100644
--- a/x11/babl/pkg-plist
+++ b/x11/babl/pkg-plist
@@ -5,6 +5,15 @@ include/babl-0.1/babl/babl.h
 lib/babl-0.1/CIE.a
 lib/babl-0.1/CIE.la
 lib/babl-0.1/CIE.so
+lib/babl-0.1/cairo.a
+lib/babl-0.1/cairo.la
+lib/babl-0.1/cairo.so
+lib/babl-0.1/fast-float.a
+lib/babl-0.1/fast-float.la
+lib/babl-0.1/fast-float.so
+lib/babl-0.1/float.a
+lib/babl-0.1/float.la
+lib/babl-0.1/float.so
 lib/babl-0.1/gegl-fixups.a
 lib/babl-0.1/gegl-fixups.la
 lib/babl-0.1/gegl-fixups.so
@@ -23,15 +32,11 @@ lib/babl-0.1/naive-CMYK.so
 lib/babl-0.1/sse-fixups.a
 lib/babl-0.1/sse-fixups.la
 lib/babl-0.1/sse-fixups.so
-lib/girepository-1.0/Babl-0.1.typelib
 lib/libbabl-0.1.a
 lib/libbabl-0.1.la
 lib/libbabl-0.1.so
 lib/libbabl-0.1.so.0
 libdata/pkgconfig/babl.pc
-share/gir-1.0/Babl-0.1.gir
-@dirrmtry share/gir-1.0
-@dirrmtry lib/girepository-1.0
 @dirrm lib/babl-0.1
 @dirrm include/babl-0.1/babl
 @dirrm include/babl-0.1