5 files changed, 35 insertions, 20 deletions

diff --git a/devel/liboil/Makefile b/devel/liboil/Makefile
index b2bedf55eb7c..3f58245a64ad 100644
--- a/devel/liboil/Makefile
+++ b/devel/liboil/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	liboil
-PORTVERSION=	0.2.2
-PORTREVISION=	1
+PORTVERSION=	0.3.1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.schleef.org/liboil/download/
 
diff --git a/devel/liboil/distinfo b/devel/liboil/distinfo
index 5d5d3ccc4f55..bf361f02cf62 100644
--- a/devel/liboil/distinfo
+++ b/devel/liboil/distinfo
@@ -1,2 +1,2 @@
-MD5 (liboil-0.2.2.tar.gz) = 5eeab2994b45f088c3b36a71ae66fb94
-SIZE (liboil-0.2.2.tar.gz) = 415092
+MD5 (liboil-0.3.1.tar.gz) = de49ae5fb8b793ed5cd72d38dc6779ae
+SIZE (liboil-0.3.1.tar.gz) = 539507
diff --git a/devel/liboil/files/patch-configure b/devel/liboil/files/patch-configure
index fa07fe2c728a..ac0cdaa69ddc 100644
--- a/devel/liboil/files/patch-configure
+++ b/devel/liboil/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	Sun Nov 28 19:14:30 2004
-+++ configure	Sun Nov 28 19:15:34 2004
-@@ -20691,13 +20691,13 @@
+--- configure.orig	Thu Mar 17 10:45:20 2005
++++ configure	Sat Mar 19 11:55:47 2005
+@@ -20895,13 +20895,13 @@
  
  fi
  
--LIBOIL_CFLAGS="$LIBOIL_CFLAGS -D_GNU_SOURCE -D_POSIX_C_SOURCE=200112L -I\$(top_srcdir)"
-+LIBOIL_CFLAGS="$LIBOIL_CFLAGS -D_GNU_SOURCE -I\$(top_srcdir)"
+-LIBOIL_CFLAGS="$LIBOIL_CFLAGS -D_GNU_SOURCE -D_POSIX_C_SOURCE=200112L -I\$(top_srcdir) -O2"
++LIBOIL_CFLAGS="$LIBOIL_CFLAGS -D_GNU_SOURCE -I\$(top_srcdir) -O2"
  
  
  LIBOIL_LIBS="\$(top_builddir)/liboil/liboil-$LIBOIL_MAJORMINOR.la"
@@ -15,4 +15,4 @@
 +pkgconfigdir="\$(prefix)/libdata/pkgconfig"
  
  
-                                                                                                                         ac_config_files="$ac_config_files Makefile liboil/Makefile liboil/copy/Makefile liboil/dct/Makefile liboil/md5/Makefile liboil/jpeg/Makefile liboil/simdpack/Makefile testsuite/Makefile examples/Makefile examples/jpeg/Makefile examples/md5/Makefile liboil.pc"
+ #CFLAGS=`echo "$CFLAGS" | sed -e 's/-O[0-9*]//g'`
diff --git a/devel/liboil/files/patch-liboil_liboilcpu.c b/devel/liboil/files/patch-liboil_liboilcpu.c
deleted file mode 100644
index a7f287bc0fc9..000000000000
--- a/devel/liboil/files/patch-liboil_liboilcpu.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- liboil/liboilcpu.c.orig	Sun Nov 28 13:15:12 2004
-+++ liboil/liboilcpu.c	Sun Nov 28 13:15:41 2004
-@@ -64,6 +64,7 @@
-   char **f;
- 
-   cpuinfo = get_cpuinfo();
-+  if (cpuinfo == NULL) return;
- 
-   cpuinfo_flags = get_cpuinfo_flags_string(cpuinfo);
-   if (cpuinfo_flags == NULL) return;
diff --git a/devel/liboil/pkg-plist b/devel/liboil/pkg-plist
index 1f5e864de3a2..7d1433340d01 100644
--- a/devel/liboil/pkg-plist
+++ b/devel/liboil/pkg-plist
@@ -3,7 +3,10 @@ include/liboil-%%VERSION%%/liboil/liboilcpu.h
 include/liboil-%%VERSION%%/liboil/liboildebug.h
 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/liboilprototype.h
+include/liboil-%%VERSION%%/liboil/liboilrandom.h
 include/liboil-%%VERSION%%/liboil/liboiltypes.h
 lib/liboil-%%VERSION%%.a
 lib/liboil-%%VERSION%%.so
@@ -12,5 +15,28 @@ lib/liboiltmp1.a
 lib/liboiltmp1.so
 lib/liboiltmp1.so.0
 libdata/pkgconfig/liboil-%%VERSION%%.pc
+share/gtk-doc/html/liboil/ch01.html
+share/gtk-doc/html/liboil/ch02.html
+share/gtk-doc/html/liboil/home.png
+share/gtk-doc/html/liboil/index.html
+share/gtk-doc/html/liboil/index.sgml
+share/gtk-doc/html/liboil/left.png
+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-doc.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
+share/gtk-doc/html/liboil/liboil-liboilrandom.html
+share/gtk-doc/html/liboil/liboil-liboiltest.html
+share/gtk-doc/html/liboil/liboil.devhelp
+share/gtk-doc/html/liboil/right.png
+share/gtk-doc/html/liboil/style.css
+share/gtk-doc/html/liboil/up.png
+@dirrm share/gtk-doc/html/liboil
+@unexec rmdir %D/share/gtk-doc/html 2>/dev/null || true
+@unexec rmdir %D/share/gtk-doc 2>/dev/null || true
 @dirrm include/liboil-%%VERSION%%/liboil
 @dirrm include/liboil-%%VERSION%%