diff options
| author | sketch <sketch@pkgsrc.org> | 2003-12-19 11:59:39 +0000 |
|---|---|---|
| committer | sketch <sketch@pkgsrc.org> | 2003-12-19 11:59:39 +0000 |
| commit | 511ea1387eb0b8254d0a03c028d7936b1ec05269 (patch) | |
| tree | 61aec5657632591ad4a83a385431fb543f785f4b /lang/ruby-base | |
| parent | bb2bebcee377f7e25cdf58c44704f130520b712d (diff) | |
| download | pkgsrc-511ea1387eb0b8254d0a03c028d7936b1ec05269.tar.gz | |
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 (limited to 'lang/ruby-base')
| -rw-r--r-- | lang/ruby-base/Makefile | 4 | ||||
| -rw-r--r-- | lang/ruby-base/Makefile.common | 8 | ||||
| -rw-r--r-- | lang/ruby-base/distinfo | 3 | ||||
| -rw-r--r-- | lang/ruby-base/patches/patch-ai | 13 |
4 files changed, 5 insertions, 23 deletions
diff --git a/lang/ruby-base/Makefile b/lang/ruby-base/Makefile index 628a1339c53..98c9f19e84a 100644 --- a/lang/ruby-base/Makefile +++ b/lang/ruby-base/Makefile @@ -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 --git a/lang/ruby-base/Makefile.common b/lang/ruby-base/Makefile.common index 85ef82dd078..7b0ec8f2b1f 100644 --- a/lang/ruby-base/Makefile.common +++ b/lang/ruby-base/Makefile.common @@ -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_VERSION?= 1.7 # current, not tested. 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 --git a/lang/ruby-base/distinfo b/lang/ruby-base/distinfo index 4ac38ed477f..909522de977 100644 --- a/lang/ruby-base/distinfo +++ b/lang/ruby-base/distinfo @@ -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-ac) = 5b897041345ec4077fa2165e3c4c58a6671b942d SHA1 (patch-ae) = 8c9925dcb7d4fdb9aad5432befbc3b21c56eb884 SHA1 (patch-af) = 33aa9f1e524e2f4a6dd2f1310ce7358744b83a8c SHA1 (patch-ag) = 4b5893b55253526af687bc81a9acea3686a00d39 -SHA1 (patch-ai) = f863d34b93088732ebf274aa654026f5b5e6ab45 SHA1 (patch-aj) = d61950c108cda41a7a5227f02c583bc6e85e43bb diff --git a/lang/ruby-base/patches/patch-ai b/lang/ruby-base/patches/patch-ai deleted file mode 100644 index d2596242fa2..00000000000 --- a/lang/ruby-base/patches/patch-ai +++ /dev/null @@ -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 |