From 62a2699369c8b701c3a21f8be92cd4272d831070 Mon Sep 17 00:00:00 2001
From: Tilman Sauerbeck <tilman@crux.nu>
Date: Sun, 15 Apr 2007 10:40:11 +0200
Subject: [PATCH] ruby-cairo: updated to 1.4.1

---
 ruby-cairo/.footprint      | 11 +++++++++--
 ruby-cairo/.md5sum         |  3 +--
 ruby-cairo/Pkgfile         | 13 +++++--------
 ruby-cairo/ruby-cairo.diff | 22 ----------------------
 4 files changed, 15 insertions(+), 34 deletions(-)
 delete mode 100644 ruby-cairo/ruby-cairo.diff

diff --git a/ruby-cairo/.footprint b/ruby-cairo/.footprint
index d832d9ac6..460827813 100644
--- a/ruby-cairo/.footprint
+++ b/ruby-cairo/.footprint
@@ -4,6 +4,13 @@ drwxr-xr-x	root/root	usr/lib/ruby/
 drwxr-xr-x	root/root	usr/lib/ruby/site_ruby/
 drwxr-xr-x	root/root	usr/lib/ruby/site_ruby/1.8/
 -rw-r--r--	root/root	usr/lib/ruby/site_ruby/1.8/cairo.rb
+drwxr-xr-x	root/root	usr/lib/ruby/site_ruby/1.8/cairo/
+-rw-r--r--	root/root	usr/lib/ruby/site_ruby/1.8/cairo/context.rb
+drwxr-xr-x	root/root	usr/lib/ruby/site_ruby/1.8/cairo/context/
+-rw-r--r--	root/root	usr/lib/ruby/site_ruby/1.8/cairo/context/circle.rb
+-rw-r--r--	root/root	usr/lib/ruby/site_ruby/1.8/cairo/context/path.rb
+-rw-r--r--	root/root	usr/lib/ruby/site_ruby/1.8/cairo/context/quad.rb
+-rw-r--r--	root/root	usr/lib/ruby/site_ruby/1.8/cairo/context/rectangle.rb
 drwxr-xr-x	root/root	usr/lib/ruby/site_ruby/1.8/linux/
--r-xr-xr-x	root/root	usr/lib/ruby/site_ruby/1.8/linux/cairo.so
--r-xr-xr-x	root/root	usr/lib/ruby/site_ruby/1.8/linux/rb_cairo.h
+-rwxr-xr-x	root/root	usr/lib/ruby/site_ruby/1.8/linux/cairo.so
+-rw-r--r--	root/root	usr/lib/ruby/site_ruby/1.8/linux/rb_cairo.h
diff --git a/ruby-cairo/.md5sum b/ruby-cairo/.md5sum
index 6693d4a2d..b58ce60b2 100644
--- a/ruby-cairo/.md5sum
+++ b/ruby-cairo/.md5sum
@@ -1,2 +1 @@
-d5b4da3a6aafd28cf2a0dcbdafb82b04  rcairo-1.2.0.tar.gz
-aa2e712c7818ee7cde3f3982e74af6f6  ruby-cairo.diff
+f71b78681c3986436347387c06e66ad8  rcairo-1.4.1.tar.gz
diff --git a/ruby-cairo/Pkgfile b/ruby-cairo/Pkgfile
index ddb313d26..845612cc2 100644
--- a/ruby-cairo/Pkgfile
+++ b/ruby-cairo/Pkgfile
@@ -4,18 +4,15 @@
 # Depends on: ruby cairo
 
 name=ruby-cairo
-version=1.2.0
+version=1.4.1
 release=1
-source=(http://cairographics.org/releases/rcairo-$version.tar.gz \
-        $name.diff)
+source=(http://cairographics.org/releases/rcairo-$version.tar.gz)
 
 build () {
 	cd rcairo-$version
 
-	patch -Np1 -i $SRC/$name.diff
+	ruby extconf.rb
 
-	ruby setup.rb config
-	ruby setup.rb setup
-
-	DESTDIR=$PKG ruby setup.rb install
+	make
+	make DESTDIR=$PKG install
 }
diff --git a/ruby-cairo/ruby-cairo.diff b/ruby-cairo/ruby-cairo.diff
deleted file mode 100644
index 1d371e68d..000000000
--- a/ruby-cairo/ruby-cairo.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -aur rcairo-1.2.0.orig/setup.rb rcairo-1.2.0/setup.rb
---- rcairo-1.2.0.orig/setup.rb	2006-09-10 13:24:51.880828750 +0200
-+++ rcairo-1.2.0/setup.rb	2006-09-10 13:26:21.978459500 +0200
-@@ -537,7 +537,7 @@
- module FileOperations
- 
-   def mkdir_p(dirname, prefix = nil)
--    dirname = prefix + File.expand_path(dirname) if prefix
-+    dirname = ENV["DESTDIR"] + prefix + File.expand_path(dirname) if prefix
-     $stderr.puts "mkdir -p #{dirname}" if verbose?
-     return if no_harm?
- 
-@@ -624,7 +624,8 @@
-     $stderr.puts "install #{from} #{dest}" if verbose?
-     return if no_harm?
- 
--    realdest = prefix ? prefix + File.expand_path(dest) : dest
-+	realdest = ENV["DESTDIR"]
-+    realdest += prefix ? prefix + File.expand_path(dest) : dest
-     realdest = File.join(realdest, File.basename(from)) if File.dir?(realdest)
-     str = File.binread(from)
-     if diff?(str, realdest)