[pkgsrc/trunk]: pkgsrc/textproc/ruby-eruby Fix build problem on Solaris, dete...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/939edb553958
branches:  trunk
changeset: 489141:939edb553958
user:      taca <taca%pkgsrc.org@localhost>
date:      Thu Feb 17 15:11:23 2005 +0000

description:
Fix build problem on Solaris, detecting recursive macro assignment
in Makefile.

Bump PKGREVISION.

diffstat:

 textproc/ruby-eruby/Makefile         |  4 ++--
 textproc/ruby-eruby/distinfo         |  6 +++---
 textproc/ruby-eruby/patches/patch-ab |  4 ++--
 textproc/ruby-eruby/patches/patch-ac |  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diffs (65 lines):

diff -r c81dd6f46e02 -r 939edb553958 textproc/ruby-eruby/Makefile
--- a/textproc/ruby-eruby/Makefile      Thu Feb 17 15:04:12 2005 +0000
+++ b/textproc/ruby-eruby/Makefile      Thu Feb 17 15:11:23 2005 +0000
@@ -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 -r c81dd6f46e02 -r 939edb553958 textproc/ruby-eruby/distinfo
--- a/textproc/ruby-eruby/distinfo      Thu Feb 17 15:04:12 2005 +0000
+++ b/textproc/ruby-eruby/distinfo      Thu Feb 17 15:11:23 2005 +0000
@@ -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 -r c81dd6f46e02 -r 939edb553958 textproc/ruby-eruby/patches/patch-ab
--- a/textproc/ruby-eruby/patches/patch-ab      Thu Feb 17 15:04:12 2005 +0000
+++ b/textproc/ruby-eruby/patches/patch-ab      Thu Feb 17 15:11:23 2005 +0000
@@ -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 @@
 -      $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 -r c81dd6f46e02 -r 939edb553958 textproc/ruby-eruby/patches/patch-ac
--- a/textproc/ruby-eruby/patches/patch-ac      Thu Feb 17 15:04:12 2005 +0000
+++ b/textproc/ruby-eruby/patches/patch-ac      Thu Feb 17 15:11:23 2005 +0000
@@ -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 @@
 -      $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"