From d53e470ee6cfb27d66403f91317ba4add77b46e1 Mon Sep 17 00:00:00 2001 From: taca Date: Sun, 18 Sep 2005 13:38:50 +0000 Subject: Adding DrafonFly BSD support based on patch provided by Joerg Sonnenberger. Bump PKGREVISION. --- lang/ruby18-base/Makefile | 4 +-- lang/ruby18-base/distinfo | 8 +++++- lang/ruby18-base/patches/patch-au | 12 +++++++++ lang/ruby18-base/patches/patch-av | 52 +++++++++++++++++++++++++++++++++++++++ lang/ruby18-base/patches/patch-aw | 13 ++++++++++ lang/ruby18-base/patches/patch-ax | 13 ++++++++++ lang/ruby18-base/patches/patch-ay | 16 ++++++++++++ lang/ruby18-base/patches/patch-az | 13 ++++++++++ 8 files changed, 128 insertions(+), 3 deletions(-) create mode 100644 lang/ruby18-base/patches/patch-au create mode 100644 lang/ruby18-base/patches/patch-av create mode 100644 lang/ruby18-base/patches/patch-aw create mode 100644 lang/ruby18-base/patches/patch-ax create mode 100644 lang/ruby18-base/patches/patch-ay create mode 100644 lang/ruby18-base/patches/patch-az (limited to 'lang/ruby18-base') diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile index 8e5aab4fc32..e1cee2cf9e1 100644 --- a/lang/ruby18-base/Makefile +++ b/lang/ruby18-base/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.6 2005/06/23 16:54:47 taca Exp $ +# $NetBSD: Makefile,v 1.7 2005/09/18 13:38:50 taca Exp $ # DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= lang ruby MASTER_SITES= ${MASTER_SITE_RUBY} diff --git a/lang/ruby18-base/distinfo b/lang/ruby18-base/distinfo index 68389d712ef..64e5a2da0cb 100644 --- a/lang/ruby18-base/distinfo +++ b/lang/ruby18-base/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2005/06/23 16:54:47 taca Exp $ +$NetBSD: distinfo,v 1.3 2005/09/18 13:38:50 taca Exp $ SHA1 (ruby/ruby-1.8.2.tar.gz) = 409a917d3a0aba41f45bd053b767c85b2bc35ffa RMD160 (ruby/ruby-1.8.2.tar.gz) = fc4dcdc2dda9bfbcf8ca19ca090aa55a18ea06a4 @@ -15,3 +15,9 @@ SHA1 (patch-aq) = be270544464ad51bbc1e2deb238dec16ab7308d7 SHA1 (patch-ar) = b9743d012e1c70573b590973a68e1d640ebab1c5 SHA1 (patch-as) = 19acb0f24b0e24c6253ea5df8592a39b38223b91 SHA1 (patch-at) = ee6b178f5fe31616253e5b47a979c31d18db2a6c +SHA1 (patch-au) = f49bce921fec7d58c59e686d83c671ae71e28e1d +SHA1 (patch-av) = 16955a5779607374b8ca80ab1abe04d07dcef03d +SHA1 (patch-aw) = 95ccd93d39f9b13e5a4c34f5dae5764e984b5682 +SHA1 (patch-ax) = 00e9e4ba94fb550863d635d91b3da0aed3b15dea +SHA1 (patch-ay) = ff77057f34279635d05a80ce316a478e3b528ab4 +SHA1 (patch-az) = 22484716620583e289da3c7d01a55163a1194d93 diff --git a/lang/ruby18-base/patches/patch-au b/lang/ruby18-base/patches/patch-au new file mode 100644 index 00000000000..715dff04b72 --- /dev/null +++ b/lang/ruby18-base/patches/patch-au @@ -0,0 +1,12 @@ +$NetBSD: patch-au,v 1.1 2005/09/18 13:38:50 taca Exp $ + +--- error.c.orig 2005-07-15 16:08:36.000000000 +0000 ++++ error.c +@@ -1108,7 +1108,6 @@ void + rb_sys_fail(mesg) + const char *mesg; + { +- extern int errno; + int n = errno; + VALUE arg; + diff --git a/lang/ruby18-base/patches/patch-av b/lang/ruby18-base/patches/patch-av new file mode 100644 index 00000000000..181a5f416a6 --- /dev/null +++ b/lang/ruby18-base/patches/patch-av @@ -0,0 +1,52 @@ +$NetBSD: patch-av,v 1.1 2005/09/18 13:38:50 taca Exp $ + +--- process.c.orig 2005-07-15 16:12:12.000000000 +0000 ++++ process.c +@@ -2050,7 +2050,6 @@ static VALUE + p_uid_change_privilege(obj, id) + VALUE obj, id; + { +- extern int errno; + int uid; + + check_uid_switch(); +@@ -2602,7 +2601,6 @@ static VALUE + p_gid_change_privilege(obj, id) + VALUE obj, id; + { +- extern int errno; + int gid; + + check_gid_switch(); +@@ -3129,7 +3127,6 @@ static VALUE + p_uid_switch(obj) + VALUE obj; + { +- extern int errno; + int uid, euid; + + check_uid_switch(); +@@ -3171,7 +3168,6 @@ static VALUE + p_uid_switch(obj) + VALUE obj; + { +- extern int errno; + int uid, euid; + + check_uid_switch(); +@@ -3242,7 +3238,6 @@ static VALUE + p_gid_switch(obj) + VALUE obj; + { +- extern int errno; + int gid, egid; + + check_gid_switch(); +@@ -3283,7 +3278,6 @@ static VALUE + p_gid_switch(obj) + VALUE obj; + { +- extern int errno; + int gid, egid; + + check_gid_switch(); diff --git a/lang/ruby18-base/patches/patch-aw b/lang/ruby18-base/patches/patch-aw new file mode 100644 index 00000000000..35e21d68f4a --- /dev/null +++ b/lang/ruby18-base/patches/patch-aw @@ -0,0 +1,13 @@ +$NetBSD: patch-aw,v 1.1 2005/09/18 13:38:50 taca Exp $ + +--- ext/pty/pty.c.orig 2005-07-15 16:16:50.000000000 +0000 ++++ ext/pty/pty.c +@@ -103,8 +103,6 @@ char *MasterDevice = "/dev/pty%s", + + static char SlaveName[DEVICELEN]; + +-extern int errno; +- + #ifndef HAVE_SETEUID + # ifdef HAVE_SETREUID + # define seteuid(e) setreuid(-1, (e)) diff --git a/lang/ruby18-base/patches/patch-ax b/lang/ruby18-base/patches/patch-ax new file mode 100644 index 00000000000..de226636477 --- /dev/null +++ b/lang/ruby18-base/patches/patch-ax @@ -0,0 +1,13 @@ +$NetBSD: patch-ax,v 1.1 2005/09/18 13:38:50 taca Exp $ + +--- ext/sdbm/_sdbm.c.orig 2005-07-15 16:18:36.000000000 +0000 ++++ ext/sdbm/_sdbm.c +@@ -103,7 +103,7 @@ static int duppair proto((char *, datu + /* + * externals + */ +-#if !defined sun && !defined MSDOS && !defined _WIN32 && !defined __CYGWIN__ ++#if !defined sun && !defined MSDOS && !defined _WIN32 && !defined __CYGWIN__ && !defined(errno) + extern int errno; + #endif + diff --git a/lang/ruby18-base/patches/patch-ay b/lang/ruby18-base/patches/patch-ay new file mode 100644 index 00000000000..a0a5bb88898 --- /dev/null +++ b/lang/ruby18-base/patches/patch-ay @@ -0,0 +1,16 @@ +$NetBSD: patch-ay,v 1.1 2005/09/18 13:38:50 taca Exp $ + +--- ext/dl/dl.c.orig 2003-06-16 16:25:38.000000000 +0900 ++++ ext/dl/dl.c +@@ -543,7 +543,11 @@ rb_io_to_ptr(VALUE self) + GetOpenFile(self, fptr); + fp = fptr->f; + ++#if defined(__DragonFly__) ++ return fp ? rb_dlptr_new(fp, 0, 0) : Qnil; ++#else + return fp ? rb_dlptr_new(fp, sizeof(FILE), 0) : Qnil; ++#endif + } + + VALUE diff --git a/lang/ruby18-base/patches/patch-az b/lang/ruby18-base/patches/patch-az new file mode 100644 index 00000000000..b31ba889a60 --- /dev/null +++ b/lang/ruby18-base/patches/patch-az @@ -0,0 +1,13 @@ +$NetBSD: patch-az,v 1.1 2005/09/18 13:38:50 taca Exp $ + +--- io.c.orig 2004-12-25 19:56:39.000000000 +0900 ++++ io.c +@@ -32,7 +32,7 @@ + # define NO_LONG_FNAME + #endif + +-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(sun) || defined(_nec_ews) ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(sun) || defined(_nec_ews) + # define USE_SETVBUF + #endif + -- cgit v1.2.3