- Correct some syntax of buildlink3.mk.

- Fix shared library handling; now it expected to work on Solaris
  and Linux.

Bump PKGREVISION.

6 files changed, 73 insertions, 22 deletions

diff --git a/textproc/ruby-eruby/Makefile b/textproc/ruby-eruby/Makefile
index 314446772b0..faa72ff38b8 100644
--- a/textproc/ruby-eruby/Makefile
+++ b/textproc/ruby-eruby/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2004/11/28 04:30:48 taca Exp $
+# $NetBSD: Makefile,v 1.9 2004/12/16 13:22: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=	1
 CATEGORIES=	textproc ruby
 MASTER_SITES=	http://www.modruby.net/archive/
 
@@ -20,7 +21,9 @@ CONFIGURE_SCRIPT=	${RUBY} configure.rb
 CONFIGURE_ARGS=		--enable-shared \
 			--with-charset="${ERUBY_DEFAULT_CHARSET}"
 INSTALL_TARGET=		site-install
-PLIST_SUBST+=		ERUBY_MAJOR=${ERUBY_MAJOR} ERUBY_MINOR=${ERUBY_MINOR}
+PLIST_SUBST+=		ERUBY_MAJOR=${ERUBY_MAJOR} \
+			ERUBY_MINOR=${ERUBY_MINOR} \
+			ERUBY_TEENY=${ERUBY_TEENY}
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/textproc/ruby-eruby/PLIST b/textproc/ruby-eruby/PLIST
index b6308325614..9e1131733a1 100644
--- a/textproc/ruby-eruby/PLIST
+++ b/textproc/ruby-eruby/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2004/12/04 17:20:47 taca Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/12/16 13:22:23 taca Exp $
 bin/eruby
 include/eruby.h
-lib/liberuby.so.${ERUBY_MAJOR}.${ERUBY_MINOR}
-lib/liberuby.so.${ERUBY_MAJOR}
+lib/liberuby.so.${ERUBY_MAJOR}${ERUBY_MINOR}
+lib/liberuby.so.${ERUBY_MAJOR}${ERUBY_MINOR}.${ERUBY_TEENY}
 lib/liberuby.so
 lib/liberuby.a
 ${RUBY_SITEARCHLIBDIR}/eruby.${RUBY_DLEXT}
diff --git a/textproc/ruby-eruby/buildlink3.mk b/textproc/ruby-eruby/buildlink3.mk
index cff63a1ff68..1ac977c16b5 100644
--- a/textproc/ruby-eruby/buildlink3.mk
+++ b/textproc/ruby-eruby/buildlink3.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/11/28 04:30:48 taca Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/12/16 13:22:23 taca Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 RUBY_ERUBY_BUILDLINK3_MK:=	${RUBY_ERUBY_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ruby-eruby
+BUILDLINK_DEPENDS+=	${RUBY_PKGPREFIX}-eruby
 .endif
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:N${RUBY_PKGPREFIX}-eruby}
diff --git a/textproc/ruby-eruby/distinfo b/textproc/ruby-eruby/distinfo
index c826e89a7a1..7be85c7a20d 100644
--- a/textproc/ruby-eruby/distinfo
+++ b/textproc/ruby-eruby/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2004/11/28 04:30:48 taca Exp $
+$NetBSD: distinfo,v 1.7 2004/12/16 13:22: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) = 55f0b3661286a107858e71599f9522ae2fc8389c
-SHA1 (patch-ac) = f2bc2d847ea84b28acbfea8733e309c2bee6b1b0
+SHA1 (patch-ab) = f2ac0f71c71a6c51fd7366f9affde453d9790818
+SHA1 (patch-ac) = 336d3fadeeb76bf90ed8bf224135fa8c3fdedd3f
diff --git a/textproc/ruby-eruby/patches/patch-ab b/textproc/ruby-eruby/patches/patch-ab
index 11790b0bed3..b99c0690197 100644
--- a/textproc/ruby-eruby/patches/patch-ab
+++ b/textproc/ruby-eruby/patches/patch-ab
@@ -1,13 +1,37 @@
-$NetBSD: patch-ab,v 1.1 2002/01/05 06:16:36 taca Exp $
+$NetBSD: patch-ab,v 1.2 2004/12/16 13:22:23 taca Exp $
 
---- configure.rb.in.orig	Mon Jul 23 12:24:09 2001
+--- configure.rb.in.orig	2003-01-20 16:22:41.000000000 +0900
 +++ configure.rb.in
-@@ -61,7 +61,7 @@
-     $LIBERUBY_ALIASES = "liberuby.so.$(MAJOR).$(MINOR) liberuby.so"
+@@ -47,27 +47,22 @@ $LIBERUBY_A = "liberuby.a"
+ $LIBERUBY = "${LIBERUBY_A}"
+ $LIBERUBYARG="$(LIBERUBY_A)"
+ 
+-$LIBERUBY_SO = "liberuby.#{CONFIG['DLEXT']}.$(MAJOR).$(MINOR).$(TEENY)"
+-$LIBERUBY_ALIASES = "liberuby.#{CONFIG['DLEXT']}"
++$LIBERUBY_SO = "liberuby.#{CONFIG['DLEXT']}.$(MAJOR_MINOR)"
++$LIBERUBY_ALIASES = "liberuby.so.$(MAJOR_MINOR).$(TEENY) liberuby.so"
+ 
+ if $ENABLE_SHARED
+   $LIBERUBY = "${LIBERUBY_SO}"
+   $LIBERUBYARG = "-L. -leruby"
+   case PLATFORM
+-  when /-sunos4/
+-    $LIBERUBY_ALIASES = "liberuby.so.$(MAJOR).$(MINOR) liberuby.so"
+   when /-linux/
+-    $DLDFLAGS = '-Wl,-soname,liberuby.so.$(MAJOR).$(MINOR)'
+-    $LIBERUBY_ALIASES = "liberuby.so.$(MAJOR).$(MINOR) liberuby.so"
++    $DLDFLAGS = '-Wl,-soname,liberuby.so.$(MAJOR_MINOR)'
    when /-(freebsd|netbsd)/
-     $LIBERUBY_SO = "liberuby.so.$(MAJOR).$(MINOR)"
+-    $LIBERUBY_SO = "liberuby.so.$(MAJOR).$(MINOR)"
 -    if PLATFORM =~ /elf/ || PLATFORM =~ /-freebsd[3-9]/
 +    if PLATFORM =~ /elf/ and PLATFORM =~ /-freebsd[3-9]/
        $LIBERUBY_SO = "liberuby.so.$(MAJOR_MINOR)"
        $LIBERUBY_ALIASES = "liberuby.so"
-     else
+-    else
+-      $LIBERUBY_ALIASES = "liberuby.so.$(MAJOR) liberuby.so"
+     end
+   when /-solaris/
++    $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 5b4aab9ff28..d2f7eb6f258 100644
--- a/textproc/ruby-eruby/patches/patch-ac
+++ b/textproc/ruby-eruby/patches/patch-ac
@@ -1,13 +1,37 @@
-$NetBSD: patch-ac,v 1.1 2002/01/05 06:16:36 taca Exp $
+$NetBSD: patch-ac,v 1.2 2004/12/16 13:22:23 taca Exp $
 
---- configure.rb.orig	Mon Jul 23 12:24:09 2001
+--- configure.rb.orig	2003-02-10 12:18:10.000000000 +0900
 +++ configure.rb
-@@ -426,7 +426,7 @@
-     $LIBERUBY_ALIASES = "liberuby.so.$(MAJOR).$(MINOR) liberuby.so"
+@@ -443,27 +443,22 @@ $LIBERUBY_A = "liberuby.a"
+ $LIBERUBY = "${LIBERUBY_A}"
+ $LIBERUBYARG="$(LIBERUBY_A)"
+ 
+-$LIBERUBY_SO = "liberuby.#{CONFIG['DLEXT']}.$(MAJOR).$(MINOR).$(TEENY)"
+-$LIBERUBY_ALIASES = "liberuby.#{CONFIG['DLEXT']}"
++$LIBERUBY_SO = "liberuby.#{CONFIG['DLEXT']}.$(MAJOR_MINOR)"
++$LIBERUBY_ALIASES = "liberuby.so.$(MAJOR_MINOR).$(TEENY) liberuby.so"
+ 
+ if $ENABLE_SHARED
+   $LIBERUBY = "${LIBERUBY_SO}"
+   $LIBERUBYARG = "-L. -leruby"
+   case PLATFORM
+-  when /-sunos4/
+-    $LIBERUBY_ALIASES = "liberuby.so.$(MAJOR).$(MINOR) liberuby.so"
+   when /-linux/
+-    $DLDFLAGS = '-Wl,-soname,liberuby.so.$(MAJOR).$(MINOR)'
+-    $LIBERUBY_ALIASES = "liberuby.so.$(MAJOR).$(MINOR) liberuby.so"
++    $DLDFLAGS = '-Wl,-soname,liberuby.so.$(MAJOR_MINOR)'
    when /-(freebsd|netbsd)/
-     $LIBERUBY_SO = "liberuby.so.$(MAJOR).$(MINOR)"
+-    $LIBERUBY_SO = "liberuby.so.$(MAJOR).$(MINOR)"
 -    if PLATFORM =~ /elf/ || PLATFORM =~ /-freebsd[3-9]/
 +    if PLATFORM =~ /elf/ and PLATFORM =~ /-freebsd[3-9]/
        $LIBERUBY_SO = "liberuby.so.$(MAJOR_MINOR)"
        $LIBERUBY_ALIASES = "liberuby.so"
-     else
+-    else
+-      $LIBERUBY_ALIASES = "liberuby.so.$(MAJOR) liberuby.so"
+     end
+   when /-solaris/
++    $DLDFLAGS = "$DLDFLAGS "'-Wl,-h,liberuby.so.$(MAJOR_MINOR)'
+     $XLDFLAGS = "-R$(prefix)/lib"
+   when /-hpux/
+     $XLDFLAGS = "-Wl,+s,+b,$(prefix)/lib"