Make this work on Linux. All other ruby-packages seem to work just fine

after this.

6 files changed, 39 insertions, 15 deletions

diff --git a/lang/ruby-base/Makefile b/lang/ruby-base/Makefile
index 9baba7587cc..748c62c8b6a 100644
--- a/lang/ruby-base/Makefile
+++ b/lang/ruby-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/02/17 15:28:01 dillo Exp $
+# $NetBSD: Makefile,v 1.11 2003/03/16 19:44:30 jschauma Exp $
 # FreeBSD Id: ports/lang/ruby/Makefile,v 1.39 2000/10/20 19:56:03 knu Exp
 
 DISTNAME=	${RUBY_DISTNAME}
@@ -99,4 +99,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${f:C/^(doc|ext)\///}
 .endfor
 
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/ruby-base/Makefile.common b/lang/ruby-base/Makefile.common
index 261849ff0fe..ec431777c7a 100644
--- a/lang/ruby-base/Makefile.common
+++ b/lang/ruby-base/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2002/12/07 02:38:58 schmonz Exp $
+# $NetBSD: Makefile.common,v 1.11 2003/03/16 19:44:30 jschauma Exp $
 # FreeBSD: ports/Mk/bsd.ruby.mk,v 1.11 2000/11/16 17:59:40 knu Exp
 # Makefile.common: ruby common makefile, based on FreeBSD's bsd.ruby.mk.
 
@@ -72,16 +72,29 @@ RUBY_VERSION?=		1.7			# current, not tested.
 RUBY_SUFFIX?=		${_RUBY_SUFFIX}
 .endif
 
+.if ${OPSYS} == "Linux"
+RUBY_ARCH?=		${LOWER_ARCH}-${LOWER_OPSYS}
+.else
 RUBY_ARCH?=		${MACHINE_GNU_PLATFORM:S/--/-/}
+.endif
 RUBY_NAME?=		ruby${RUBY_SUFFIX}
 
 RUBY_DISTNAME?=		ruby-${RUBY_VERSION}
 RUBY_WRKSRC?=		${WRKDIR}/${RUBY_DISTNAME}
 
+.if ${OPSYS} == "Linux"
+RUBY_COMMENT=		"@comment "
+_RUBY_SUFFIX=		${RUBY_VER}
+.else
 _RUBY_SUFFIX=		${RUBY_VER:S/.//}
+.endif
 
 RUBY_PKGNAMEPREFIX?=	ruby${RUBY_SUFFIX}-	# could be rb${RUBY_SUFFIX}-
+.if ${OPSYS} == "Linux"
+RUBY_SHLIBVER?=		${RUBY_VERSION}
+.else
 RUBY_SHLIBVER?=		${RUBY_VERSION:S/.//}
+.endif
 RUBY_SHLIBMAJOR?=	${_RUBY_SUFFIX}
 
 #CONFIGURE_TARGET?=	${RUBY_ARCH}
@@ -113,6 +126,7 @@ PLIST_SUBST+=		RUBY_VERSION="${RUBY_VERSION}" \
 			_RUBY_SUFFIX="${_RUBY_SUFFIX}" \
 			RUBY_SUFFIX="${RUBY_SUFFIX}" \
 			RUBY_NAME="${RUBY_NAME}" \
+			RUBY_COMMENT=${RUBY_COMMENT} \
 			${PLIST_RUBY_DIRS:S,DIR="${LOCALBASE}/,DIR=",}
 
 # base digest checksum
diff --git a/lang/ruby-base/PLIST b/lang/ruby-base/PLIST
index 08e6439d150..f0a6246b168 100644
--- a/lang/ruby-base/PLIST
+++ b/lang/ruby-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/06/26 10:29:46 seb Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/03/16 19:44:30 jschauma Exp $
 bin/irb
 bin/ruby
 bin/ruby${_RUBY_SUFFIX}
@@ -6,8 +6,8 @@ lib/lib${RUBY_NAME}.so
 lib/lib${RUBY_NAME}.so.${RUBY_SHLIBMAJOR}
 lib/lib${RUBY_NAME}.so.${RUBY_SHLIBVER}
 ${RUBY_ARCHLIBDIR}/config.h
-${RUBY_ARCHLIBDIR}/curses.so
-${RUBY_ARCHLIBDIR}/dbm.so
+${RUBY_COMMENT}${RUBY_ARCHLIBDIR}/curses.so
+${RUBY_COMMENT}${RUBY_ARCHLIBDIR}/dbm.so
 ${RUBY_ARCHLIBDIR}/defines.h
 ${RUBY_ARCHLIBDIR}/dln.h
 ${RUBY_ARCHLIBDIR}/env.h
@@ -143,7 +143,7 @@ ${RUBY_LIBDIR}/weakref.rb
 @dirrm ${RUBY_ARCHLIBDIR}
 @dirrm ${RUBY_LIBDIR}
 @unexec ${RMDIR} %D/lib/ruby 2>/dev/null || ${TRUE}
-man/man1/ruby16.1
+man/man1/ruby${_RUBY_SUFFIX}.1
 man/man1/ruby.1
 ${RUBY_DOCDIR}/ChangeLog
 ${RUBY_DOCDIR}/NEWS
diff --git a/lang/ruby-base/buildlink2.mk b/lang/ruby-base/buildlink2.mk
index bdc437aba56..ab181460b09 100644
--- a/lang/ruby-base/buildlink2.mk
+++ b/lang/ruby-base/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/01/29 09:00:25 kei Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/03/16 19:44:30 jschauma Exp $
 #
 
 .if !defined(RUBY_BASE_BUILDLINK2_MK)
 RUBY_BASE_BUILDLINK2_MK=	# defined
 
-RUBY_MD_LIBDIR=			${MACHINE_GNU_PLATFORM:C/--/-/}
+RUBY_MD_LIBDIR=			${RUBY_ARCH}
 
 BUILDLINK_PACKAGES+=			ruby-base
 BUILDLINK_DEPENDS.ruby-base?=		ruby-base>=1.6.7nb3
diff --git a/lang/ruby-base/distinfo b/lang/ruby-base/distinfo
index ed589cd3241..4743156d9b2 100644
--- a/lang/ruby-base/distinfo
+++ b/lang/ruby-base/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2002/10/06 14:56:59 taca Exp $
+$NetBSD: distinfo,v 1.7 2003/03/16 19:44:30 jschauma Exp $
 
 SHA1 (ruby/ruby-1.6.7.tar.gz) = fd1523f17e64fd80741f2e6a77050fde16164053
 Size (ruby/ruby-1.6.7.tar.gz) = 998151 bytes
 SHA1 (patch-aa) = 62f1bd7d422a1e644896fb6548f182b709d57f23
-SHA1 (patch-ab) = 75b6b2fd6fa5c472c8b2ee0cae5bab19f8edc989
+SHA1 (patch-ab) = 7038f4fdde2147ad698f3546512fc31c336f97f0
 SHA1 (patch-ac) = 5b897041345ec4077fa2165e3c4c58a6671b942d
 SHA1 (patch-ae) = 294af53a7509372f0d7c17230c605d790f1e7bb2
 SHA1 (patch-af) = 0eb2fd9784b5924bcc233d3b81128821130c578c
diff --git a/lang/ruby-base/patches/patch-ab b/lang/ruby-base/patches/patch-ab
index 010dff7271c..9e36afd8446 100644
--- a/lang/ruby-base/patches/patch-ab
+++ b/lang/ruby-base/patches/patch-ab
@@ -1,8 +1,17 @@
-$NetBSD: patch-ab,v 1.3 2002/05/13 15:00:02 yyamano Exp $
+$NetBSD: patch-ab,v 1.4 2003/03/16 19:44:30 jschauma Exp $
 
---- configure.orig	Mon Feb 11 03:05:48 2002
-+++ configure
-@@ -5054,7 +5054,7 @@
+--- configure.orig	Sun Feb 10 13:05:48 2002
++++ configure	Sat Mar 15 19:57:03 2003
+@@ -4410,8 +4410,6 @@
+   if test "$rb_cv_binary_elf" = no; then
+     with_dln_a_out=yes
+     target_os=${target_os}-a_out
+-  else
+-    LDFLAGS="-rdynamic"
+   fi;;
+ netbsd*)
+     if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
+@@ -5054,7 +5052,7 @@
      darwin*)
  	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).$(MAJOR).$(MINOR).$(TEENY).dylib'
  	LIBRUBY_LDSHARED='cc -dynamiclib -undefined suppress -flat_namespace'
@@ -11,7 +20,7 @@ $NetBSD: patch-ab,v 1.3 2002/05/13 15:00:02 yyamano Exp $
  	LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_INSTALL_NAME).dylib'
  	;;
      *)
-@@ -5444,6 +5444,7 @@
+@@ -5444,6 +5442,7 @@
  s%@setup@%$setup%g
  s%@MINIRUBY@%$MINIRUBY%g
  s%@PREP@%$PREP%g