From owner-freebsd-ports@FreeBSD.ORG Wed Nov 9 18:16:43 2005 Return-Path: X-Original-To: ports@freebsd.org Delivered-To: freebsd-ports@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3C16A16A41F for ; Wed, 9 Nov 2005 18:16:43 +0000 (GMT) (envelope-from freebsd@powered.net) Received: from valimar.ibest.com.br (mx11.ibest.com.br [200.181.68.36]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F28543D45 for ; Wed, 9 Nov 2005 18:16:41 +0000 (GMT) (envelope-from freebsd@powered.net) Received: from [127.0.0.1] (centaurus.ibest.com.br [200.181.68.107]) by valimar.ibest.com.br (Postfix) with ESMTP id 8D93317C0B1 for ; Wed, 9 Nov 2005 16:16:35 -0200 (BRDT) Message-ID: <43723CF0.2070007@powered.net> Date: Wed, 09 Nov 2005 16:16:16 -0200 From: Rainer Alves User-Agent: Mozilla Thunderbird 1.0.7 (X11/20051105) X-Accept-Language: en-us, en MIME-Version: 1.0 To: ports@freebsd.org Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-iBEST-MailScanner-Information: Please contact the ISP for more information X-MailScanner-From: freebsd@powered.net Cc: Subject: lang/ruby18 broken X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Nov 2005 18:16:43 -0000 It seems lang/ruby18 has been broken after today's commit/update to 1.8.3. Here's what happens if you enable Oniguruma (BSDL regex library) support: ===> ruby+oniguruma-1.8.3 depends on file: /nonexistent - not found ===> Verifying patch for /nonexistent in /usr/ports/devel/oniguruma ===> Returning to build of ruby+oniguruma-1.8.3 ===> Configuring for ruby+oniguruma-1.8.3 [...] cp -p ./enc/sjis.c /usr/ports/lang/ruby18/work/ruby-1.8.3/enc/sjis.c patch -d /usr/ports/lang/ruby18/work/ruby-1.8.3 -p0 < ./re.c.181.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |--- re.c.ruby_orig 2003-11-04 18:13:57.000000000 +0900 |+++ re.c 2004-04-26 12:05:31.000000000 +0900 -------------------------- Patching file re.c using Plan A... Hunk #1 succeeded at 483 (offset 42 lines). Hunk #2 succeeded at 581 (offset 40 lines). Hunk #3 failed at 591. Hunk #4 succeeded at 807 (offset 110 lines). Hunk #5 succeeded at 811 (offset 40 lines). 1 out of 5 hunks failed--saving rejects to re.c.rej done [root@bsd /usr/ports/lang/ruby18]# cat ./work/ruby-1.8.3/re.c.rej *************** *** 588,604 **** from that. */ - rp = ALLOC(Regexp); - MEMZERO((char *)rp, Regexp, 1); - rp->buffer = ALLOC_N(char, 16); - rp->allocated = 16; - rp->fastmap = ALLOC_N(char, 256); if (flags) { rp->options = flags; } - err = re_compile_pattern(s, len, rp); - if (err != NULL) { rb_reg_raise(s, len, err, 0); } return rp; --- 591,608 ---- from that. */ + r = re_alloc_pattern(&rp); + if (r) { + re_error_code_to_str((UChar* )err, r); + rb_reg_raise(s, len, err, 0); + } + if (flags) { rp->options = flags; } + r = re_compile_pattern(s, len, rp, err); + if (r != 0) { rb_reg_raise(s, len, err, 0); } return rp; -- Rainer Alves BrasilTelecom