[pkgsrc/trunk]: pkgsrc/lang/ruby-base Remove patch-ai which worked around a b...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/64a7da28eb4a
branches:  trunk
changeset: 465009:64a7da28eb4a
user:      sketch <sketch%pkgsrc.org@localhost>
date:      Fri Dec 19 11:59:39 2003 +0000

description:
Remove patch-ai which worked around a bug previously in bsd.prefs.mk,
which is now causing the build to fail on Solaris since -r1.130 of
that file.

Bump PKGREVISION for Solaris installations which previously had the
package installed correctly, but with a different RUBY_ARCHLIBDIR
location.

diffstat:

 lang/ruby-base/Makefile         |   4 ++--
 lang/ruby-base/Makefile.common  |   8 ++------
 lang/ruby-base/distinfo         |   3 +--
 lang/ruby-base/patches/patch-ai |  13 -------------
 4 files changed, 5 insertions(+), 23 deletions(-)

diffs (69 lines):

diff -r 5805e9d539e8 -r 64a7da28eb4a lang/ruby-base/Makefile
--- a/lang/ruby-base/Makefile   Fri Dec 19 11:43:19 2003 +0000
+++ b/lang/ruby-base/Makefile   Fri Dec 19 11:59:39 2003 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2003/09/28 09:13:57 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2003/12/19 11:59:39 sketch Exp $
 # FreeBSD Id: ports/lang/ruby/Makefile,v 1.39 2000/10/20 19:56:03 knu Exp
 
 DISTNAME=      ${RUBY_DISTNAME}
 PKGNAME=       ${RUBY_PKGNAMEPREFIX}base-${RUBY_VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 WRKSRC=                ${RUBY_WRKSRC}
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_RUBY}
diff -r 5805e9d539e8 -r 64a7da28eb4a lang/ruby-base/Makefile.common
--- a/lang/ruby-base/Makefile.common    Fri Dec 19 11:43:19 2003 +0000
+++ b/lang/ruby-base/Makefile.common    Fri Dec 19 11:59:39 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2003/06/23 21:40:22 jschauma Exp $
+# $NetBSD: Makefile.common,v 1.15 2003/12/19 11:59:39 sketch 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,11 +72,7 @@
 RUBY_SUFFIX?=          ${_RUBY_SUFFIX}
 .endif
 
-.if ${OPSYS} == "Linux"
-RUBY_ARCH?=            ${LOWER_ARCH}-${LOWER_OPSYS}
-.else
-RUBY_ARCH?=            ${LOWER_ARCH}-${LOWER_OPSYS}${APPEND_ELF}
-.endif
+RUBY_ARCH?=            ${LOWER_ARCH}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}
 RUBY_NAME?=            ruby${RUBY_SUFFIX}
 
 RUBY_DISTNAME?=                ruby-${RUBY_VERSION}
diff -r 5805e9d539e8 -r 64a7da28eb4a lang/ruby-base/distinfo
--- a/lang/ruby-base/distinfo   Fri Dec 19 11:43:19 2003 +0000
+++ b/lang/ruby-base/distinfo   Fri Dec 19 11:59:39 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2003/06/23 21:40:22 jschauma Exp $
+$NetBSD: distinfo,v 1.11 2003/12/19 11:59:39 sketch Exp $
 
 SHA1 (ruby/ruby-1.6.8.tar.gz) = 4b475ac1c837cd62b6dfe85359e1502a71b08cd1
 Size (ruby/ruby-1.6.8.tar.gz) = 1023403 bytes
@@ -8,5 +8,4 @@
 SHA1 (patch-ae) = 8c9925dcb7d4fdb9aad5432befbc3b21c56eb884
 SHA1 (patch-af) = 33aa9f1e524e2f4a6dd2f1310ce7358744b83a8c
 SHA1 (patch-ag) = 4b5893b55253526af687bc81a9acea3686a00d39
-SHA1 (patch-ai) = f863d34b93088732ebf274aa654026f5b5e6ab45
 SHA1 (patch-aj) = d61950c108cda41a7a5227f02c583bc6e85e43bb
diff -r 5805e9d539e8 -r 64a7da28eb4a lang/ruby-base/patches/patch-ai
--- a/lang/ruby-base/patches/patch-ai   Fri Dec 19 11:43:19 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2003/03/24 14:49:39 taca Exp $
-
---- config.sub.orig    2002-05-02 16:49:44.000000000 +0900
-+++ config.sub
-@@ -995,7 +995,7 @@ case $os in
-               os=`echo $os | sed -e 's|solaris1|sunos4|'`
-               ;;
-       -solaris)
--              os=-solaris2
-+              os=-solaris
-               ;;
-       -svr4*)
-               os=-sysv4