kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove patch-ai which worked around a bug previously in bsd.prefs.mk,

Browse source 
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.
This commit is contained in:
sketch 2003-12-19 11:59:39 +00:00
parent bb2bebcee3
commit 511ea1387e
4 changed files with 5 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lang/ruby-base/Makefile
View file

@ -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 # FreeBSD Id: ports/lang/ruby/Makefile,v 1.39 2000/10/20 19:56:03 knu Exp
DISTNAME= ${RUBY_DISTNAME} DISTNAME= ${RUBY_DISTNAME}
PKGNAME= ${RUBY_PKGNAMEPREFIX}base-${RUBY_VERSION} PKGNAME= ${RUBY_PKGNAMEPREFIX}base-${RUBY_VERSION}
PKGREVISION= 1 PKGREVISION= 2
WRKSRC= ${RUBY_WRKSRC} WRKSRC= ${RUBY_WRKSRC}
CATEGORIES= lang CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_RUBY} MASTER_SITES= ${MASTER_SITE_RUBY}

8
lang/ruby-base/Makefile.common
View file

@ -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 # 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. # 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} RUBY_SUFFIX?= ${_RUBY_SUFFIX}
.endif .endif
.if ${OPSYS} == "Linux" RUBY_ARCH?= ${LOWER_ARCH}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}
RUBY_ARCH?= ${LOWER_ARCH}-${LOWER_OPSYS}
.else
RUBY_ARCH?= ${LOWER_ARCH}-${LOWER_OPSYS}${APPEND_ELF}
.endif
RUBY_NAME?= ruby${RUBY_SUFFIX} RUBY_NAME?= ruby${RUBY_SUFFIX}
RUBY_DISTNAME?= ruby-${RUBY_VERSION} RUBY_DISTNAME?= ruby-${RUBY_VERSION}

3
lang/ruby-base/distinfo
View file

@ -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 SHA1 (ruby/ruby-1.6.8.tar.gz) = 4b475ac1c837cd62b6dfe85359e1502a71b08cd1
Size (ruby/ruby-1.6.8.tar.gz) = 1023403 bytes Size (ruby/ruby-1.6.8.tar.gz) = 1023403 bytes
@ -8,5 +8,4 @@ SHA1 (patch-ac) = 5b897041345ec4077fa2165e3c4c58a6671b942d
SHA1 (patch-ae) = 8c9925dcb7d4fdb9aad5432befbc3b21c56eb884 SHA1 (patch-ae) = 8c9925dcb7d4fdb9aad5432befbc3b21c56eb884
SHA1 (patch-af) = 33aa9f1e524e2f4a6dd2f1310ce7358744b83a8c SHA1 (patch-af) = 33aa9f1e524e2f4a6dd2f1310ce7358744b83a8c
SHA1 (patch-ag) = 4b5893b55253526af687bc81a9acea3686a00d39 SHA1 (patch-ag) = 4b5893b55253526af687bc81a9acea3686a00d39
SHA1 (patch-ai) = f863d34b93088732ebf274aa654026f5b5e6ab45
SHA1 (patch-aj) = d61950c108cda41a7a5227f02c583bc6e85e43bb SHA1 (patch-aj) = d61950c108cda41a7a5227f02c583bc6e85e43bb

13
lang/ruby-base/patches/patch-ai
View file

@ -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