From owner-freebsd-ports Fri Sep 27 20:40: 7 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D74BA37B401 for ; Fri, 27 Sep 2002 20:40:04 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2684643E6E for ; Fri, 27 Sep 2002 20:40:04 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8S3e3Co054440 for ; Fri, 27 Sep 2002 20:40:03 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8S3e38r054439; Fri, 27 Sep 2002 20:40:03 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 77B4737B401 for ; Fri, 27 Sep 2002 20:39:15 -0700 (PDT) Received: from schnell.net (schnell.net [209.50.225.102]) by mx1.FreeBSD.org (Postfix) with ESMTP id C0EE343E65 for ; Fri, 27 Sep 2002 20:39:14 -0700 (PDT) (envelope-from loschert@servint.com) Received: from 66-44-55-122.s376.tnt1.lnhva.md.dialup.rcn.com (66-44-55-122.s376.tnt1.lnhva.md.dialup.rcn.com [66.44.55.122]) by schnell.net (8.12.3/8.12.3) with ESMTP id g8S3dCuZ036226 for ; Fri, 27 Sep 2002 23:39:12 -0400 (EDT) (envelope-from loschert@servint.com) Message-Id: <20020927234107.X37416-100000@magel.lan.loschert.net> Date: Fri, 27 Sep 2002 23:42:04 -0400 (EDT) From: Matt Loschert To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/43441: [PATCH] unbreak devel/p5-ORBit Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 43441 >Category: ports >Synopsis: [PATCH] unbreak devel/p5-ORBit >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Sep 27 20:40:02 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Matt Loschert >Release: FreeBSD 4.7-PRERELEASE i386 >Organization: ServInt Corporation >Environment: System: FreeBSD magel.lan.loschert.net 4.7-PRERELEASE FreeBSD 4.7-PRERELEASE #0: Sat Sep 7 01:14:43 EDT 2002 loschert@magel.lan.loschert.net:/usr/obj/usr/src/sys/MAGELLAN i386 >Description: [PATCH] unbreak devel/p5-ORBit >How-To-Repeat: attempt to install the port >Fix: add the following patch files to the port: patch-aa ---------------------------------------- --- Makefile.PL.orig Fri Sep 27 22:33:14 2002 +++ Makefile.PL Fri Sep 27 22:38:08 2002 @@ -14,9 +14,9 @@ server.o types.o); -$orbit_cflags = `orbit-config --cflags client server`; +chomp($orbit_cflags = `orbit-config --cflags client server`); undef $orbit_cflags if $?; -$orbit_libs = `orbit-config --libs client server`; +chomp($orbit_libs = `orbit-config --libs client server`); undef $orbit_libs if $?; if (!defined $orbit_libs) { @@ -24,6 +24,16 @@ exit 1; } +chomp($idl_cflags = `libIDL-config --cflags`); +undef $idl_cflags if $?; +chomp($idl_libs = `libIDL-config --libs`); +undef $idl_libs if $?; + +if (!defined $idl_libs) { + print STDERR "libIDL-config not found\n"; + exit 1; +} + if ($] < 5.0045) { print STDERR "Using compatibility macros/routines for Perl 5.004\n"; push @OBJECTS,'constsub.o'; @@ -32,10 +42,10 @@ WriteMakefile( 'NAME' => 'CORBA::ORBit', 'VERSION_FROM' => 'ORBit.pm', - 'LIBS' => [$orbit_libs." -lIDL"], + 'LIBS' => ["$orbit_libs $idl_libs"], 'DEFINE' => ($] < 5.0045 ? '-DPERL5004_COMPAT ' : ''), - 'INC' => $orbit_cflags, + 'INC' => "$orbit_cflags $idl_cflags", 'OBJECT' => join(" ", @OBJECTS), # 'XSOPT' => '-nolinenumbers', 'OPTIMIZE' => '-g -Wall', ---------------------------------------- patch-ab ---------------------------------------- --- demarshal.c.orig Fri Sep 27 22:43:09 2002 +++ demarshal.c Fri Sep 27 22:43:36 2002 @@ -7,7 +7,7 @@ #include "types.h" #define RECV_BUFFER_LEFT(buf) \ - (((guchar *)buf->message_body + GIOP_MESSAGE_BUFFER(buf)->message_header.message_size) - (guchar *)buf->cur) + (((guchar *)buf->message_body + 12 + GIOP_MESSAGE_BUFFER(buf)->message_header.message_size) - (guchar *)buf->cur) static CORBA_boolean ---------------------------------------- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message