diff options
author | jlam <jlam> | 2008-03-31 15:26:34 +0000 |
---|---|---|
committer | jlam <jlam> | 2008-03-31 15:26:34 +0000 |
commit | b9b998ef3391423f840d7cf0b8f7c7441b4d18bc (patch) | |
tree | fae44f19a9600b6ce9ac88283d0613b2ec181258 | |
parent | 3e132710a4ebb76f1a5e1fc25812600d3e1801a9 (diff) | |
download | pkgsrc-b9b998ef3391423f840d7cf0b8f7c7441b4d18bc.tar.gz |
Fix the optional loading of rubygems at the head of the rabbit scripts.
If rubygems is not found, then just continue. Bump the PKGREVISION
to 3.
-rw-r--r-- | graphics/rabbit/Makefile | 4 | ||||
-rw-r--r-- | graphics/rabbit/distinfo | 8 | ||||
-rw-r--r-- | graphics/rabbit/patches/patch-ab | 11 | ||||
-rw-r--r-- | graphics/rabbit/patches/patch-ac | 11 | ||||
-rw-r--r-- | graphics/rabbit/patches/patch-ad | 11 |
5 files changed, 30 insertions, 15 deletions
diff --git a/graphics/rabbit/Makefile b/graphics/rabbit/Makefile index da17b42377d..56cc500219c 100644 --- a/graphics/rabbit/Makefile +++ b/graphics/rabbit/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.7 2008/03/18 06:14:31 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2008/03/31 15:26:34 jlam Exp $ # DISTNAME= rabbit-0.5.5 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics ruby MASTER_SITES= http://www.cozmixng.org/~kou/download/ diff --git a/graphics/rabbit/distinfo b/graphics/rabbit/distinfo index d403dc77fb4..8522a8e5d8d 100644 --- a/graphics/rabbit/distinfo +++ b/graphics/rabbit/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.6 2008/03/18 06:14:31 jlam Exp $ +$NetBSD: distinfo,v 1.7 2008/03/31 15:26:34 jlam Exp $ SHA1 (rabbit-0.5.5.tar.gz) = 9f0071a32fb1465d245b2077b49a1afce70213c9 RMD160 (rabbit-0.5.5.tar.gz) = e2174a536ba673b807c1bb619cd0dc71acef89f0 Size (rabbit-0.5.5.tar.gz) = 3627230 bytes -SHA1 (patch-ab) = 6a01f6596106e1aaea77b27803137ab7a1738074 -SHA1 (patch-ac) = 2113debc1c3aa5c43590b392a3086635eeca7507 -SHA1 (patch-ad) = 337b696b0dabf5f741529b6b63e4abeb238bbb30 +SHA1 (patch-ab) = 848ccd627644dde7e36d27032ab318af729dc3ce +SHA1 (patch-ac) = 8e9e5a831f54e4a350a422d3c0027aa7dfa85d35 +SHA1 (patch-ad) = ee455a7c34587fa68fc8152d6ad0a6f48b608222 diff --git a/graphics/rabbit/patches/patch-ab b/graphics/rabbit/patches/patch-ab index 1d166864da3..49af1494d00 100644 --- a/graphics/rabbit/patches/patch-ab +++ b/graphics/rabbit/patches/patch-ab @@ -1,12 +1,17 @@ -$NetBSD: patch-ab,v 1.1 2008/03/18 06:14:31 jlam Exp $ +$NetBSD: patch-ab,v 1.2 2008/03/31 15:26:34 jlam Exp $ --- bin/rabbit.orig 2008-03-01 04:54:40.000000000 -0500 +++ bin/rabbit -@@ -4,6 +4,7 @@ +@@ -4,6 +4,12 @@ GC.disable require "rbconfig" -+require "rubygems" rescue LoadError ++begin ++ require "rubygems" ++rescue LoadError ++ nil ++end ++ require "rabbit/console" require "rabbit/source" require "rabbit/renderer" diff --git a/graphics/rabbit/patches/patch-ac b/graphics/rabbit/patches/patch-ac index 8d8a5e1afaa..69f34c64943 100644 --- a/graphics/rabbit/patches/patch-ac +++ b/graphics/rabbit/patches/patch-ac @@ -1,12 +1,17 @@ -$NetBSD: patch-ac,v 1.1 2008/03/18 06:14:31 jlam Exp $ +$NetBSD: patch-ac,v 1.2 2008/03/31 15:26:34 jlam Exp $ --- bin/rabbit-theme-manager.orig 2008-03-01 04:54:40.000000000 -0500 +++ bin/rabbit-theme-manager -@@ -1,6 +1,7 @@ +@@ -1,6 +1,12 @@ #!/usr/bin/env ruby # -*- ruby -*- -+require "rubygems" rescue LoadError ++begin ++ require "rubygems" ++rescue LoadError ++ nil ++end ++ require "fileutils" require "rabbit/console" diff --git a/graphics/rabbit/patches/patch-ad b/graphics/rabbit/patches/patch-ad index dda75ed09a2..37b65b77bd5 100644 --- a/graphics/rabbit/patches/patch-ad +++ b/graphics/rabbit/patches/patch-ad @@ -1,12 +1,17 @@ -$NetBSD: patch-ad,v 1.1 2008/03/18 06:14:31 jlam Exp $ +$NetBSD: patch-ad,v 1.2 2008/03/31 15:26:34 jlam Exp $ --- bin/rabrick.orig 2008-03-01 04:54:40.000000000 -0500 +++ bin/rabrick -@@ -1,6 +1,7 @@ +@@ -1,6 +1,12 @@ #!/usr/bin/env ruby # -*- ruby -*- -+require "rubygems" rescue LoadError ++begin ++ require "rubygems" ++rescue LoadError ++ nil ++end ++ require "webrick" require 'tofu/tofulet' |