3 files changed, 73 insertions, 22 deletions
diff --git a/devel/liboil/patches/patch-aa b/devel/liboil/patches/patch-aa
deleted file mode 100644
index d8997f5d67f..00000000000
--- a/devel/liboil/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2008/01/23 11:24:47 tnn Exp $
-
---- liboil/liboilcpu.c.orig	2007-04-11 08:25:16.000000000 +0200
-+++ liboil/liboilcpu.c
-@@ -578,7 +578,7 @@ oil_cpu_detect_getisax (void)
- static void
- oil_cpu_detect_kernel_support (void)
- {
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
-   int ret, enabled;
-   size_t len;
- 
-@@ -598,7 +598,7 @@ oil_cpu_detect_kernel_support (void)
-   /* Solaris is OK */
- #elif defined(__NetBSD__)
-   /* NetBSD is OK */
--#elif
-+#else
-    
-   /* If we don't know that the operating system supports SSE, don't trust that
-    * it will properly support it.
diff --git a/devel/liboil/patches/patch-ad b/devel/liboil/patches/patch-ad
new file mode 100644
index 00000000000..d41ad676c7c
--- /dev/null
+++ b/devel/liboil/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2008/02/28 19:28:24 drochner Exp $
+
+--- examples/Makefile.in.orig	2008-02-25 22:51:20.000000000 +0100
++++ examples/Makefile.in
+@@ -287,7 +287,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = jpeg md5 uberopt work huffman taylor videoscale audioresample jit
++SUBDIRS = jpeg md5 uberopt work huffman taylor videoscale audioresample
+ example1_SOURCES = example1.c
+ example1_CFLAGS = $(LIBOIL_CFLAGS)
+ example1_LDADD = $(LIBOIL_LIBS)
diff --git a/devel/liboil/patches/patch-ae b/devel/liboil/patches/patch-ae
new file mode 100644
index 00000000000..e0f6889f04b
--- /dev/null
+++ b/devel/liboil/patches/patch-ae
@@ -0,0 +1,60 @@
+$NetBSD: patch-ae,v 1.1 2008/02/28 19:28:24 drochner Exp $
+
+--- liboil/liboilcpu-arm.c.orig	2008-02-28 20:07:11.000000000 +0100
++++ liboil/liboilcpu-arm.c
+@@ -60,10 +60,6 @@
+  *
+  */
+ 
+-static void oil_cpu_detect_arch(void);
+-
+-static unsigned long oil_cpu_flags;
+-
+ extern unsigned long (*_oil_profile_stamp)(void);
+ 
+ #if defined(__arm__)
+@@ -126,6 +122,35 @@ oil_cpu_arm_getflags_cpuinfo (char *cpui
+   free (cpuinfo_flags);
+ }
+ 
++static char *
++get_proc_cpuinfo (void)
++{
++  char *cpuinfo;
++  int fd;
++  int n;
++
++  cpuinfo = malloc(4096);
++  if (cpuinfo == NULL) return NULL;
++
++  fd = open("/proc/cpuinfo", O_RDONLY);
++  if (fd < 0) {
++    free (cpuinfo);
++    return NULL;
++  }
++
++  n = read(fd, cpuinfo, 4095);
++  if (n < 0) {
++    free (cpuinfo);
++    close (fd);
++    return NULL;
++  }
++  cpuinfo[n] = 0;
++
++  close (fd);
++
++  return cpuinfo;
++}
++
+ static void
+ oil_cpu_detect_arm(void)
+ {
+@@ -249,7 +274,7 @@ oil_cpu_detect_mips(void)
+ }
+ #endif
+ 
+-static void
++void
+ oil_cpu_detect_arch(void)
+ {
+ #if defined(__i386__) || defined(__amd64__)