Update to 0.3.2.

Add patch for cpu instruction detection [1].

Submitted by:	[1] bland (earlier version)

4 files changed, 120 insertions, 4 deletions

diff --git a/devel/liboil/Makefile b/devel/liboil/Makefile
index f900b402c8f6..3f22ef1a2350 100644
--- a/devel/liboil/Makefile
+++ b/devel/liboil/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	liboil
-PORTVERSION=	0.3.1
+PORTVERSION=	0.3.2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.schleef.org/liboil/download/
 
@@ -17,6 +17,7 @@ USE_GNOME=	glib20
 USE_REINPLACE=	yes
 USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS=	--disable-gtk-doc
 
 PLIST_SUB=	VERSION=${PORTVERSION:R}
 
diff --git a/devel/liboil/distinfo b/devel/liboil/distinfo
index bf361f02cf62..0711c68c310f 100644
--- a/devel/liboil/distinfo
+++ b/devel/liboil/distinfo
@@ -1,2 +1,2 @@
-MD5 (liboil-0.3.1.tar.gz) = de49ae5fb8b793ed5cd72d38dc6779ae
-SIZE (liboil-0.3.1.tar.gz) = 539507
+MD5 (liboil-0.3.2.tar.gz) = f127d90ee8531d03184b76f18e3997be
+SIZE (liboil-0.3.2.tar.gz) = 568293
diff --git a/devel/liboil/files/patch-liboil_liboilcpu.c b/devel/liboil/files/patch-liboil_liboilcpu.c
new file mode 100644
index 000000000000..6d5a57f46497
--- /dev/null
+++ b/devel/liboil/files/patch-liboil_liboilcpu.c
@@ -0,0 +1,107 @@
+--- liboil/liboilcpu.c.orig	Sat May 21 14:12:56 2005
++++ liboil/liboilcpu.c	Sat May 21 14:34:37 2005
+@@ -59,7 +59,11 @@
+   cpuinfo = malloc(4096);
+   if (cpuinfo == NULL) return NULL;
+ 
++#if defined(__FreeBSD__)
++  fd = open("/var/run/dmesg.boot", O_RDONLY);
++#else
+   fd = open("/proc/cpuinfo", O_RDONLY);
++#endif
+   if (fd < 0) return NULL;
+ 
+   n = read(fd, cpuinfo, 4095);
+@@ -84,6 +88,37 @@
+   }
+ 
+   flags = strsplit(cpuinfo_flags);
++#if defined(__FreeBSD__)
++  for (f = flags; *f; f++) {
++    if (strcmp (*f, "CMOV") == 0) {
++      OIL_DEBUG ("cpu flag %s", *f);
++      oil_cpu_flags |= OIL_IMPL_FLAG_CMOV;
++    }
++    if (strcmp (*f, "MMX") == 0) {
++      OIL_DEBUG ("cpu flag %s", *f);
++      oil_cpu_flags |= OIL_IMPL_FLAG_MMX;
++    }
++    if (strcmp (*f, "SSE") == 0) {
++      OIL_DEBUG ("cpu flag %s", *f);
++      oil_cpu_flags |= OIL_IMPL_FLAG_SSE;
++    }
++    if (strcmp (*f, "AMIE") == 0) {
++      OIL_DEBUG ("cpu flag %s", *f);
++      oil_cpu_flags |= OIL_IMPL_FLAG_MMXEXT;
++    }
++    if (strcmp (*f, "SSE2") == 0) {
++      OIL_DEBUG ("cpu flag %s", *f);
++      oil_cpu_flags |= OIL_IMPL_FLAG_SSE2;
++    }
++    if (strcmp (*f, "3DNow!") == 0) {
++      OIL_DEBUG ("cpu flag %s", *f);
++      oil_cpu_flags |= OIL_IMPL_FLAG_3DNOW;
++    }
++    if (strcmp (*f, "DSP") == 0) {
++      OIL_DEBUG ("cpu flag %s", *f);
++      oil_cpu_flags |= OIL_IMPL_FLAG_3DNOWEXT;
++    }
++#else
+   for (f = flags; *f; f++) {
+     if (strcmp (*f, "cmov") == 0) {
+       OIL_DEBUG ("cpu flag %s", *f);
+@@ -113,6 +148,7 @@
+       OIL_DEBUG ("cpu flag %s", *f);
+       oil_cpu_flags |= OIL_IMPL_FLAG_3DNOWEXT;
+     }
++#endif
+ 
+     free (*f);
+   }
+@@ -282,12 +318,22 @@
+   char *end;
+   char *colon;
+ 
++#if defined(__FreeBSD__)
++  flags = strstr(cpuinfo,"Features");
++#else
+   flags = strstr(cpuinfo,"flags");
++#endif
+   if (flags == NULL) return NULL;
+ 
++#if defined(__FreeBSD__)
++  end = strchr(flags, '>');
++  if (end == NULL) return NULL;
++  colon = strchr (flags, '<');
++#else
+   end = strchr(flags, '\n');
+   if (end == NULL) return NULL;
+   colon = strchr (flags, ':');
++#endif
+   if (colon == NULL) return NULL;
+   colon++;
+   if(colon >= end) return NULL;
+@@ -303,15 +349,22 @@
+   char *tok;
+   int n = 0;
+ 
++#if !defined(__FreeBSD__)
+   while (*s == ' ') s++;
++#endif
+ 
+   list = malloc (1 * sizeof(char *));
+   while (*s) {
+     tok = s;
++#if defined(__FreeBSD__)
++    while (*s && *s != ',') s++;
++    list[n] = _strndup (tok, s - tok);
++    s++;
++#else
+     while (*s && *s != ' ') s++;
+-
+     list[n] = _strndup (tok, s - tok);
+     while (*s && *s == ' ') s++;
++#endif
+     list = realloc (list, (n + 2) * sizeof(char *));
+     n++;
+   }
diff --git a/devel/liboil/pkg-plist b/devel/liboil/pkg-plist
index 7d1433340d01..d7bac1ed51c9 100644
--- a/devel/liboil/pkg-plist
+++ b/devel/liboil/pkg-plist
@@ -5,12 +5,14 @@ include/liboil-%%VERSION%%/liboil/liboilfuncs.h
 include/liboil-%%VERSION%%/liboil/liboilfunction.h
 include/liboil-%%VERSION%%/liboil/liboilgcc.h
 include/liboil-%%VERSION%%/liboil/liboilparameter.h
+include/liboil-%%VERSION%%/liboil/liboilprofile.h
 include/liboil-%%VERSION%%/liboil/liboilprototype.h
 include/liboil-%%VERSION%%/liboil/liboilrandom.h
+include/liboil-%%VERSION%%/liboil/liboiltest.h
 include/liboil-%%VERSION%%/liboil/liboiltypes.h
 lib/liboil-%%VERSION%%.a
 lib/liboil-%%VERSION%%.so
-lib/liboil-%%VERSION%%.so.0
+lib/liboil-%%VERSION%%.so.1
 lib/liboiltmp1.a
 lib/liboiltmp1.so
 lib/liboiltmp1.so.0
@@ -25,7 +27,13 @@ share/gtk-doc/html/liboil/liboil-OilFunction.html
 share/gtk-doc/html/liboil/liboil-liboil.html
 share/gtk-doc/html/liboil/liboil-liboilcpu.html
 share/gtk-doc/html/liboil/liboil-liboildebug.html
+share/gtk-doc/html/liboil/liboil-liboilfuncs-conv.html
+share/gtk-doc/html/liboil/liboil-liboilfuncs-copy.html
+share/gtk-doc/html/liboil/liboil-liboilfuncs-dct.html
 share/gtk-doc/html/liboil/liboil-liboilfuncs-doc.html
+share/gtk-doc/html/liboil/liboil-liboilfuncs-math.html
+share/gtk-doc/html/liboil/liboil-liboilfuncs-math8x8.html
+share/gtk-doc/html/liboil/liboil-liboilfuncs-pixel.html
 share/gtk-doc/html/liboil/liboil-liboilparameter.html
 share/gtk-doc/html/liboil/liboil-liboilprofile.html
 share/gtk-doc/html/liboil/liboil-liboilprototype.html