From owner-freebsd-ports Fri Aug 2 9:20:29 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 69BDA37B400 for ; Fri, 2 Aug 2002 09:20:03 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7FACA43E5E for ; Fri, 2 Aug 2002 09:20:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g72GK2JU059754 for ; Fri, 2 Aug 2002 09:20:02 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g72GK2Ac059753; Fri, 2 Aug 2002 09:20:02 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 40E9337B400 for ; Fri, 2 Aug 2002 09:14:13 -0700 (PDT) Received: from telford.tecc.co.uk (telford.tecc.co.uk [195.217.37.78]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0FC3143E3B for ; Fri, 2 Aug 2002 09:14:12 -0700 (PDT) (envelope-from alex@telford.tecc.co.uk) Received: from telford.tecc.co.uk (localhost [127.0.0.1]) by telford.tecc.co.uk (8.12.3/8.12.3) with ESMTP id g72GGCUG012567 for ; Fri, 2 Aug 2002 17:16:13 +0100 (BST) (envelope-from alex@telford.tecc.co.uk) Received: (from alex@localhost) by telford.tecc.co.uk (8.12.3/8.12.3/Submit) id g72GGCFl012566; Fri, 2 Aug 2002 17:16:12 +0100 (BST) Message-Id: <200208021616.g72GGCFl012566@telford.tecc.co.uk> Date: Fri, 2 Aug 2002 17:16:12 +0100 (BST) From: Alex Hayward & Reply-To: Alex Hayward & To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/41267: omniORB port is for 3.0.4 and not 3.0.5 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: 41267 >Category: ports >Synopsis: omniORB port is for 3.0.4 and not 3.0.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Aug 02 09:20:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Alex Hayward & >Release: FreeBSD 4.6-RC i386 >Organization: >Environment: System: FreeBSD telford.tecc.co.uk 4.6-RC FreeBSD 4.6-RC #0: Mon Jun 10 11:04:37 BST 2002 alex@telford.tecc.co.uk:/usr/src/sys/compile/TELFORD i386 >Description: The version of omniORB in ports is an out of date version which can exhibit problems under FreeBSD (threads can end waiting forever for a recv() to return). >How-To-Repeat: >Fix: This needs to be applied with patch -E to avoid getting left-over empty files. diff -ruN omniORB/Makefile omniORB.new/Makefile --- omniORB/Makefile Wed Aug 29 10:01:49 2001 +++ omniORB.new/Makefile Fri Aug 2 16:59:35 2002 @@ -6,9 +6,10 @@ # PORTNAME= omniORB -PORTVERSION= 3.0.4 +PORTVERSION= 3.0.5 CATEGORIES= devel -MASTER_SITES= ftp://ftp.uk.research.att.com/pub/omniORB/omniORB3/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= omniorb DISTNAME= ${PORTNAME}_${PORTVERSION:S/.//g} MAINTAINER= ejc@bazzle.com diff -ruN omniORB/distinfo omniORB.new/distinfo --- omniORB/distinfo Wed Aug 29 10:01:49 2001 +++ omniORB.new/distinfo Thu Jul 25 16:52:46 2002 @@ -1 +1 @@ -MD5 (omniORB_304.tar.gz) = 60fe9ee00b217e20070727e7eb6fd399 +MD5 (omniORB_305.tar.gz) = 49c6949e7508524e0c27cf68287c4dc9 diff -ruN omniORB/files/patch-aa omniORB.new/files/patch-aa --- omniORB/files/patch-aa Fri Mar 23 00:35:26 2001 +++ omniORB.new/files/patch-aa Thu Jul 25 17:16:19 2002 @@ -1,10 +1,10 @@ ---- config/config.mk.orig Fri Aug 18 16:09:38 2000 -+++ config/config.mk Mon Sep 11 17:26:22 2000 -@@ -77,6 +77,7 @@ - #platform = x86_freebsd_3.2 +--- config/config.mk.orig Thu Jul 25 16:42:35 2002 ++++ config/config.mk Thu Jul 25 16:42:07 2002 +@@ -85,6 +85,7 @@ #platform = x86_freebsd_4.0 + #platform = x86_openbsd_3.0 #platform = pc486_rtems_4.5.0 +platform = __PLATFORM__ + # On Win32 platforms, uncomment the following line to build all the binaries - # with debugging information. Useful if you want to debug the binaries under diff -ruN omniORB/files/patch-aj omniORB.new/files/patch-aj --- omniORB/files/patch-aj Fri Mar 23 00:35:26 2001 +++ omniORB.new/files/patch-aj Thu Jul 25 17:16:23 2002 @@ -1,5 +1,5 @@ ---- mk/platforms/x86_freebsd_4.0.mk.orig Fri Aug 18 16:09:33 2000 -+++ mk/platforms/x86_freebsd_4.0.mk Tue Sep 12 09:56:52 2000 +--- mk/platforms/x86_freebsd_4.0.mk.orig Thu Jul 25 16:36:31 2002 ++++ mk/platforms/x86_freebsd_4.0.mk Thu Jul 25 16:38:55 2002 @@ -10,7 +10,7 @@ # # You must set a path to a Python 1.5.2 interpreter. @@ -17,7 +17,7 @@ CPP = /usr/libexec/cpp --CXX = g++295 +-CXX = g++ +CXX ?= g++ CXXMAKEDEPEND += -D__cplusplus -D__GNUG__ -D__GNUC__ -CXXDEBUGFLAGS = -O2 @@ -29,7 +29,7 @@ EgcsMajorVersion = 1 EgcsMinorVersion = 1 # This is actually a post-1.0 egcs snapshot. --CC = gcc295 +-CC = gcc +CC ?= gcc CMAKEDEPEND += -D__GNUC__ -CDEBUGFLAGS = -O2 diff -ruN omniORB/files/patch-ak omniORB.new/files/patch-ak --- omniORB/files/patch-ak Fri Mar 23 00:35:26 2001 +++ omniORB.new/files/patch-ak Thu Jul 25 17:16:28 2002 @@ -1,11 +1,19 @@ ---- src/tool/omniidl/cxx/idlutil.cc.orig Fri Aug 18 16:09:06 2000 -+++ src/tool/omniidl/cxx/idlutil.cc Mon Sep 11 17:44:48 2000 -@@ -148,7 +148,7 @@ - IdlIntLiteral - idl_strtoul(const char* text, int base) - { -- return strtoull(text, 0, base); -+ return strtouq(text, 0, base); - } - - # endif +--- src/tool/omniidl/cxx/idlutil.cc.orig Thu Jul 25 16:49:13 2002 ++++ src/tool/omniidl/cxx/idlutil.cc Thu Jul 25 16:49:25 2002 +@@ -139,13 +139,13 @@ + IdlIntLiteral ull; + switch (base) { + case 8: +- sscanf(text, "%I64o", &ull); ++ sscanf(text, "%qo", &ull); + break; + case 10: +- sscanf(text, "%I64d", &ull); ++ sscanf(text, "%qd", &ull); + break; + case 16: +- sscanf(text, "%I64x", &ull); ++ sscanf(text, "%qx", &ull); + break; + default: + abort(); diff -ruN omniORB/files/patch-mk-beforedir.mk omniORB.new/files/patch-mk-beforedir.mk --- omniORB/files/patch-mk-beforedir.mk Fri Mar 23 00:35:26 2001 +++ omniORB.new/files/patch-mk-beforedir.mk Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- mk/beforedir.mk.orig Wed Mar 14 12:29:06 2001 -+++ mk/beforedir.mk Wed Mar 14 12:29:37 2001 -@@ -313,7 +313,7 @@ - - CORBA_IDL_FILES = $(CORBA_INTERFACES:%=%.idl) - --CORBA_STUB_DIR = $(TOP)/stub -+CORBA_STUB_DIR = $(TOP)/idl - - CorbaImplementation = NO_CORBA_IMPLEMENTATION - diff -ruN omniORB/pkg-plist omniORB.new/pkg-plist --- omniORB/pkg-plist Wed Aug 29 10:01:49 2001 +++ omniORB.new/pkg-plist Thu Jul 25 19:08:46 2002 @@ -1,10 +1,9 @@ %%PORTDOCS%%share/doc/omniORB/README.FreeBSD %%PORTDOCS%%share/doc/omniORB/README.unix -%%PORTDOCS%%share/doc/omniORB/ReleaseNote_omniORB_304 +%%PORTDOCS%%share/doc/omniORB/ReleaseNote_omniORB_305 %%PORTDOCS%%share/doc/omniORB/omniNames.html %%PORTDOCS%%share/doc/omniORB/omniNames.pdf %%PORTDOCS%%share/doc/omniORB/omniNames.ps -%%PORTDOCS%%share/doc/omniORB/omniNames.tex %%PORTDOCS%%share/doc/omniORB/omniORB.pdf %%PORTDOCS%%share/doc/omniORB/omniORB.ps %%PORTDOCS%%share/doc/omniORB/omniORB/contents_motif.gif @@ -31,7 +30,6 @@ %%PORTDOCS%%share/doc/omniORB/omnithread.html %%PORTDOCS%%share/doc/omniORB/omnithread.pdf %%PORTDOCS%%share/doc/omniORB/omnithread.ps -%%PORTDOCS%%share/doc/omniORB/omnithread.tex %%PORTDOCS%%share/doc/omniORB/tex/cover.tex %%PORTDOCS%%share/doc/omniORB/tex/ode.tex %%PORTDOCS%%share/doc/omniORB/tex/omniORB.bib @@ -39,10 +37,11 @@ %%PORTDOCS%%share/doc/omniORB/tex/omniParTcl.tex %%PORTDOCS%%share/doc/omniORB/tex/omniidl.tex %%PORTDOCS%%share/doc/omniORB/tex/omnithread.tex +%%PORTDOCS%%share/doc/omniORB/tex/utilities.tex +%%PORTDOCS%%share/doc/omniORB/tex/omniNames.tex %%PORTDOCS%%share/doc/omniORB/utilities.html %%PORTDOCS%%share/doc/omniORB/utilities.pdf %%PORTDOCS%%share/doc/omniORB/utilities.ps -%%PORTDOCS%%share/doc/omniORB/utilities.tex bin/catior bin/convertior bin/genior @@ -98,6 +97,7 @@ include/omnithread/posix.h include/omnithread/pthread_nt.h include/omnithread/solaris.h +include/omnithread/os2_impl.h lib/%%PYTHON_VERSION%%/site-packages/omniidl/__init__.py lib/%%PYTHON_VERSION%%/site-packages/omniidl/__init__.pyc lib/%%PYTHON_VERSION%%/site-packages/omniidl/idlast.py @@ -186,32 +186,31 @@ lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/dump.pyc lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/example.py lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/example.pyc -lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/showast.py lib/_omniidlmodule.so lib/_omniidlmodule.so.0 lib/_omniidlmodule.so.0.1 lib/libCOS3.a lib/libCOS3.so lib/libCOS3.so.0 -lib/libCOS3.so.0.4 +lib/libCOS3.so.0.5 lib/libCOSBOA3.a lib/libCOSBOA3.so lib/libCOSBOA3.so.0 -lib/libCOSBOA3.so.0.4 +lib/libCOSBOA3.so.0.5 lib/libCOSDynamic3.a lib/libCOSDynamic3.so lib/libCOSDynamic3.so.0 -lib/libCOSDynamic3.so.0.4 +lib/libCOSDynamic3.so.0.5 lib/libomniDynamic3.a lib/libomniDynamic3.so lib/libomniDynamic3.so.0 -lib/libomniDynamic3.so.0.4 +lib/libomniDynamic3.so.0.5 lib/libomniGK_alone.a lib/libomniGK_stub.a lib/libomniORB3.a lib/libomniORB3.so lib/libomniORB3.so.0 -lib/libomniORB3.so.0.4 +lib/libomniORB3.so.0.5 lib/libomnithread.a lib/libomnithread.so lib/libomnithread.so.2 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message