summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortaca <taca>2005-02-17 15:11:23 +0000
committertaca <taca>2005-02-17 15:11:23 +0000
commitdbd596144f3f903e80aebb2769d343cf7ed1b71b (patch)
treebb8f5eb2d20bc4b44ddb6cbe27fca4a862de295b
parentd415c4134dd60a8aea7c2a2dac556a4525fb9539 (diff)
downloadpkgsrc-dbd596144f3f903e80aebb2769d343cf7ed1b71b.tar.gz
Fix build problem on Solaris, detecting recursive macro assignment
in Makefile. Bump PKGREVISION.
-rw-r--r--textproc/ruby-eruby/Makefile4
-rw-r--r--textproc/ruby-eruby/distinfo6
-rw-r--r--textproc/ruby-eruby/patches/patch-ab4
-rw-r--r--textproc/ruby-eruby/patches/patch-ac4
4 files changed, 9 insertions, 9 deletions
diff --git a/textproc/ruby-eruby/Makefile b/textproc/ruby-eruby/Makefile
index e11e3b9bdf2..8414901b5c9 100644
--- a/textproc/ruby-eruby/Makefile
+++ b/textproc/ruby-eruby/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2005/01/28 14:08:02 taca Exp $
+# $NetBSD: Makefile,v 1.11 2005/02/17 15:11:23 taca Exp $
# FreeBSD: ports/textproc/eruby/Makefile,v 1.9 2000/12/12 14:04:26 knu Exp
DISTNAME= eruby-${ERUBY_VERSION}
PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= textproc ruby
MASTER_SITES= http://www.modruby.net/archive/
diff --git a/textproc/ruby-eruby/distinfo b/textproc/ruby-eruby/distinfo
index 7be85c7a20d..07150096192 100644
--- a/textproc/ruby-eruby/distinfo
+++ b/textproc/ruby-eruby/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2004/12/16 13:22:23 taca Exp $
+$NetBSD: distinfo,v 1.8 2005/02/17 15:11:23 taca Exp $
SHA1 (ruby/eruby-1.0.5.tar.gz) = d8900f8a7c30661351d2bf6f53753fa86df24996
Size (ruby/eruby-1.0.5.tar.gz) = 61187 bytes
SHA1 (patch-aa) = ca7a9d4d9827b18040cbebac54eabe762355b76d
-SHA1 (patch-ab) = f2ac0f71c71a6c51fd7366f9affde453d9790818
-SHA1 (patch-ac) = 336d3fadeeb76bf90ed8bf224135fa8c3fdedd3f
+SHA1 (patch-ab) = bf3bce49348e0e157b67e5e4a26c2e9411248a84
+SHA1 (patch-ac) = 1b035cbaec6c905a01344eb56401f5b0c4fa6ed6
diff --git a/textproc/ruby-eruby/patches/patch-ab b/textproc/ruby-eruby/patches/patch-ab
index b99c0690197..76b61f84419 100644
--- a/textproc/ruby-eruby/patches/patch-ab
+++ b/textproc/ruby-eruby/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2004/12/16 13:22:23 taca Exp $
+$NetBSD: patch-ab,v 1.3 2005/02/17 15:11:23 taca Exp $
--- configure.rb.in.orig 2003-01-20 16:22:41.000000000 +0900
+++ configure.rb.in
@@ -31,7 +31,7 @@ $NetBSD: patch-ab,v 1.2 2004/12/16 13:22:23 taca Exp $
- $LIBERUBY_ALIASES = "liberuby.so.$(MAJOR) liberuby.so"
end
when /-solaris/
-+ $DLDFLAGS = "$DLDFLAGS "'-Wl,-h,liberuby.so.$(MAJOR_MINOR)'
++ $DLDFLAGS = "#{$DLDFLAGS} "'-Wl,-h,liberuby.so.$(MAJOR_MINOR)'
$XLDFLAGS = "-R$(prefix)/lib"
when /-hpux/
$XLDFLAGS = "-Wl,+s,+b,$(prefix)/lib"
diff --git a/textproc/ruby-eruby/patches/patch-ac b/textproc/ruby-eruby/patches/patch-ac
index d2f7eb6f258..6794e07409f 100644
--- a/textproc/ruby-eruby/patches/patch-ac
+++ b/textproc/ruby-eruby/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2004/12/16 13:22:23 taca Exp $
+$NetBSD: patch-ac,v 1.3 2005/02/17 15:11:23 taca Exp $
--- configure.rb.orig 2003-02-10 12:18:10.000000000 +0900
+++ configure.rb
@@ -31,7 +31,7 @@ $NetBSD: patch-ac,v 1.2 2004/12/16 13:22:23 taca Exp $
- $LIBERUBY_ALIASES = "liberuby.so.$(MAJOR) liberuby.so"
end
when /-solaris/
-+ $DLDFLAGS = "$DLDFLAGS "'-Wl,-h,liberuby.so.$(MAJOR_MINOR)'
++ $DLDFLAGS = "#{$DLDFLAGS} "'-Wl,-h,liberuby.so.$(MAJOR_MINOR)'
$XLDFLAGS = "-R$(prefix)/lib"
when /-hpux/
$XLDFLAGS = "-Wl,+s,+b,$(prefix)/lib"