6 files changed, 193 insertions, 138 deletions

diff --git a/devel/ORBacus/Makefile b/devel/ORBacus/Makefile
index b5aaf12dee78..0a4189803f58 100644
--- a/devel/ORBacus/Makefile
+++ b/devel/ORBacus/Makefile
@@ -1,27 +1,29 @@
-# New ports collection makefile for:	omniBroker
-# Date created:		17 May 1997
+# New ports collection makefile for:	ORBacus
+# Date created:		22 June 1998
 # Whom:			ejc@bazzle.com
-# Version required:	1.0
+# Version required:	3.0b1
 #
-# $Id: Makefile,v 1.4 1997/11/26 23:58:54 jseger Exp $
+# $Id$
 #
 
-DISTNAME=	OB-1.0
-PKGNAME=	omniBroker-1.0
+DISTNAME=	OB-3.0b1
+PKGNAME=	ORBacus-3.0b1
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.ooc.com/pub/OmniBroker/1.0/
+MASTER_SITES=	ftp://ftp.ooc.com/pub/OB/3.0/
 
 MAINTAINER=	ejc@bazzle.com
 
-BROKEN=		awaiting upgrade to ORBacus -- see PR ports/7034
+BUILD_DEPENDS=  gcc28:${PORTSDIR}/lang/gcc28 \
+		g++28:${PORTSDIR}/lang/gcc28 \
+		${PREFIX}/lib/gcc-lib/i386-unknown-freebsd3.0/2.8.1/libstdc++.a:${PORTSDIR}/lang/glibstdc++28
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ENV=	CXX=c++ CXXFLAGS="--no-implicit-templates -fhandle-exceptions -Wall"
+CONFIGURE_ENV=	CXX=g++28 CXXFLAGS="-O -pipe"
 MAN1=		idl.1
 
 post-install:
-	${LDCONFIG} -m $(PREFIX)/lib
-	${MKDIR} ${PREFIX}/share/doc/omniBroker
-	${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/omniBroker
+	${LDCONFIG} -m ${PREFIX}/lib
+	${MKDIR} ${PREFIX}/share/doc/ORBacus
+	${INSTALL_DATA} ${WRKSRC}/ob/LICENSE ${PREFIX}/share/doc/ORBacus
 
 .include <bsd.port.mk>
diff --git a/devel/ORBacus/distinfo b/devel/ORBacus/distinfo
index 99c3f9b2cba0..f90a5029958d 100644
--- a/devel/ORBacus/distinfo
+++ b/devel/ORBacus/distinfo
@@ -1 +1 @@
-MD5 (OB-1.0.tar.gz) = 8a4afce8d6a5a5541d60ec7d5d9e698a
+MD5 (OB-3.0b1.tar.gz) = a132ae700a49206a6ef70aeae52d098b
diff --git a/devel/ORBacus/files/patch-aa b/devel/ORBacus/files/patch-aa
index 10dbc8836e9f..faab83d8564b 100644
--- a/devel/ORBacus/files/patch-aa
+++ b/devel/ORBacus/files/patch-aa
@@ -1,84 +1,72 @@
-Only in ../OB-1.0b8.freebsd/config: Make.rules
-diff -c -r -b ./demo/Makefile.in ../OB-1.0b8.freebsd/demo/Makefile.in
-*** ./demo/Makefile.in	Fri May  9 12:43:29 1997
---- ../OB-1.0b8.freebsd/demo/Makefile.in	Sun May 18 09:16:54 1997
+*** ob/demo/chat/Client.cpp.orig	Mon Jun  8 16:55:23 1998
+--- ob/demo/chat/Client.cpp	Tue Jun 23 09:57:59 1998
 ***************
-*** 20,26 ****
-  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-  INSTALL_DATA    = @INSTALL_DATA@
+*** 42,48 ****
+  #ifdef HAVE_TERMIO_H
+      ioctl(STDIN_FILENO, TCSETA, &TerminalSettings);
+  #else
+!     ioctl(STDIN_FILENO, TCSETS, &TerminalSettings);
+  #endif
   
-! SUBDIRS		= hello nested chat repository naming
+      //
+--- 42,48 ----
+  #ifdef HAVE_TERMIO_H
+      ioctl(STDIN_FILENO, TCSETA, &TerminalSettings);
+  #else
+!     ioctl(STDIN_FILENO, TCSANOW, &TerminalSettings);
+  #endif
   
-  all::
-  
---- 20,26 ----
-  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-  INSTALL_DATA    = @INSTALL_DATA@
-  
-! SUBDIRS		= hello nested repository naming
-  
-  all::
-  
-diff -c -r -b ./demo/chat/Client.cpp ../OB-1.0b8.freebsd/demo/chat/Client.cpp
-*** ./demo/chat/Client.cpp	Fri May  9 12:43:43 1997
---- ../OB-1.0b8.freebsd/demo/chat/Client.cpp	Sat May 17 20:12:21 1997
+      //
 ***************
-*** 17,23 ****
-  #include <stdlib.h>
-  #include <signal.h>
-  #include <unistd.h>
-! #include <termio.h>
-  #include <sys/ioctl.h>
-  
-  static struct termio TerminalSettings;
---- 17,23 ----
-  #include <stdlib.h>
-  #include <signal.h>
-  #include <unistd.h>
-! #include <term.h>
-  #include <sys/ioctl.h>
-  
-  static struct termio TerminalSettings;
-diff -c -r -b ./demo/chat/Receiver_impl.h ../OB-1.0b8.freebsd/demo/chat/Receiver_impl.h
-*** ./demo/chat/Receiver_impl.h	Fri May  9 12:43:40 1997
---- ../OB-1.0b8.freebsd/demo/chat/Receiver_impl.h	Sat May 17 20:12:31 1997
+*** 129,136 ****
+      ioctl(STDIN_FILENO, TCGETA, &ctl);
+  #else
+      struct termios ctl;
+!     ioctl(STDIN_FILENO, TCGETS, &TerminalSettings);
+!     ioctl(STDIN_FILENO, TCGETS, &ctl);
+  #endif
+      ctl.c_lflag &= ~(ICANON | ECHO);
+      ctl.c_cc[VMIN] = 1;
+--- 129,136 ----
+      ioctl(STDIN_FILENO, TCGETA, &ctl);
+  #else
+      struct termios ctl;
+!     tcgetattr(STDIN_FILENO, &TerminalSettings);
+!     tcgetattr(STDIN_FILENO, &ctl);
+  #endif
+      ctl.c_lflag &= ~(ICANON | ECHO);
+      ctl.c_cc[VMIN] = 1;
 ***************
-*** 14,20 ****
-  #include <Broadcaster.h>
-  #include <ReceiverBase_impl.h>
-  #include <OB/Reactor.h>
-! #include <termio.h>
+*** 138,144 ****
+  #ifdef HAVE_TERMIO_H
+      ioctl(STDIN_FILENO, TCSETA, &ctl);
+  #else
+!     ioctl(STDIN_FILENO, TCSETS, &ctl);
+  #endif
   
-  class Receiver_impl : public ReceiverBase_impl, public OBEventHandler
-  {
---- 14,20 ----
-  #include <Broadcaster.h>
-  #include <ReceiverBase_impl.h>
-  #include <OB/Reactor.h>
-! #include <term.h>
+      //
+--- 138,144 ----
+  #ifdef HAVE_TERMIO_H
+      ioctl(STDIN_FILENO, TCSETA, &ctl);
+  #else
+!     tcsetattr(STDIN_FILENO, TCSANOW, &ctl);
+  #endif
   
-  class Receiver_impl : public ReceiverBase_impl, public OBEventHandler
-  {
-Only in ../OB-1.0b8.freebsd/demo/chat: server
-Only in ../OB-1.0b8.freebsd/demo/hello: Hello.ref
-Only in ../OB-1.0b8.freebsd/demo/naming: Naming.ref
-Only in ../OB-1.0b8.freebsd/demo/nested: Peer.ref
-Only in ../OB-1.0b8.freebsd/demo/repository: Interface.ref
-Only in ../OB-1.0b8.freebsd/demo/repository: Repository.ref
-Only in ./idl: Gram.cpp
-Only in ./idl: Gram.h
-Only in ./idl: Scan.cpp
-Only in ../OB-1.0b8.freebsd/include/OB: Config.h
-diff -c -r -b ./include/OB/Except.h ../OB-1.0b8.freebsd/include/OB/Except.h
-*** ./include/OB/Except.h	Fri May  9 12:43:41 1997
---- ../OB-1.0b8.freebsd/include/OB/Except.h	Sat May 17 17:02:43 1997
+      //
 ***************
-*** 10,15 ****
---- 10,16 ----
+*** 179,185 ****
+  #ifdef HAVE_TERMIO_H
+      ioctl(STDIN_FILENO, TCSETA, &TerminalSettings);
+  #else
+!     ioctl(STDIN_FILENO, TCSETS, &TerminalSettings);
+  #endif
   
-  #ifndef OB_EXCEPT_H
-  #define OB_EXCEPT_H
-+ #undef minor()
+      return status;
+--- 179,185 ----
+  #ifdef HAVE_TERMIO_H
+      ioctl(STDIN_FILENO, TCSETA, &TerminalSettings);
+  #else
+!     tcsetattr(STDIN_FILENO, TCSANOW, &TerminalSettings);
+  #endif
   
-  //
-  // The Exception classes
+      return status;
diff --git a/devel/ORBacus/files/patch-ab b/devel/ORBacus/files/patch-ab
new file mode 100644
index 000000000000..c46289748f97
--- /dev/null
+++ b/devel/ORBacus/files/patch-ab
@@ -0,0 +1,19 @@
+*** ob/demo/chat/Receiver_impl.h.orig	Tue Jun 23 09:58:48 1998
+--- ob/demo/chat/Receiver_impl.h	Tue Jun 23 09:59:19 1998
+***************
+*** 14,20 ****
+  #include <Broadcaster.h>
+  #include <ReceiverBase_impl.h>
+  #include <OB/Reactor.h>
+! #include <termio.h>
+  
+  class Receiver_impl : public ReceiverBase_impl, public OBEventHandler
+  {
+--- 14,20 ----
+  #include <Broadcaster.h>
+  #include <ReceiverBase_impl.h>
+  #include <OB/Reactor.h>
+! #include <termios.h>
+  
+  class Receiver_impl : public ReceiverBase_impl, public OBEventHandler
+  {
diff --git a/devel/ORBacus/pkg-descr b/devel/ORBacus/pkg-descr
index 6c67bad17dec..d70faee387aa 100644
--- a/devel/ORBacus/pkg-descr
+++ b/devel/ORBacus/pkg-descr
@@ -1,47 +1,68 @@
-http://www.ooc.com/
-
-OmniBroker is an Object Request Broker (ORB) that is compliant to the
-Common Object Request Broker Architecture (CORBA) specification as
-defined in:
+ORBacus for C++ and Java is an Object Request Broker (ORB) that is
+compliant to the Common Object Request Broker Architecture (CORBA)
+specification as defined in:
 
   The Common Object Request Broker: Architecture and Specification
-  Revision 2.0, OMG Document 96-03-04
-
-OmniBroker is free for non-commercial use. See the file LICENSE for
-details.
-
-Some highlights of the OmniBroker Preview Release are:
-
-- Full CORBA IDL support
-
-- Complete CORBA IDL-to-C++ mapping
-
-- Uses IIOP as native protocol
-
-- Dynamic Invocation Interface
+  Revision 2.0, OMG document 97-02-25
 
-- Dynamic Skeleton Interface
+and
 
-- Interface Repository
+  IDL/Java Language Mapping, OMG document 97-03-01
 
-- Peer-to-Peer communication with nested method invocations
+ORBacus for C++ and Java is free for non-commercial use and available
+with full source code. See the file LICENSE for details. For
+commercial licenses, please email OOC at support@ooc.com.
 
-- Support for non-blocking method invocations
+Some highlights of ORBacus 3.0 Preview Release are:
 
+- Full CORBA IDL support
+- Complete CORBA IDL-to-C++ mapping
+- Complete CORBA IDL-to-Java mapping
+- Includes the following Basic Services:
+  * Naming
+  * Event
+  * Property
+- Pluggable Protocols with IIOP as default plug-in
+- Single- and Multi-Threaded with many different concurrency models:
+  * Blocking
+  * Reactive
+  * Threaded
+  * Thread per Client
+  * Thread per Request
+  * Thread Pool
+- Nested method invocations even in the single-threaded version
 - Support for timeouts
-
-- Seamless integration with X11 and Windows
-
-- A COS compliant Naming Service
-
-The current beta version has the following limitations:
-
-- Only persistent servers are currently supported
-
-- No multi-threaded applications
-
-Support for the GNU C++ compiler (version 2.7.2) is currently only
-experimental. The GNU C++ isn't fully supported yet due to the lack of
-a stable exception handling mechanism. On some platforms GNU C++
-doesn't support exception handling at all (e.g. MIPS), while on other
-platforms the exception handling is still very buggy (SPARC, Intel).
+- Seamless event loop integration with X11 and Windows
+- Full support for dynamic programming:
+  * Dynamic Invocation Interface
+  * Dynamic Skeleton Interface
+  * Interface Repository
+  * DynAny for dynamic Any type handling
+- IDL-to-HTML and IDL-to-RTF translator for generating "javadoc"-like
+  documentation
+
+The current Preview Release has the following limitations:
+
+- Only persistent (i.e. manually launched) servers are currently
+  supported
+
+ORBacus was tested to work on the following platforms:
+
+- ORBacus for C++:
+  * SGI C++ 7.1 or 7.2            SGI Irix 6.2 or 6.3
+  * SUN C++ 4.1 or 4.2            SUN Solaris 2.5
+  * HP aC++ A.01.00 or A.01.03    HP-UX B.10.20
+  * AIX C Set ++ xlC 3.1.4.6      AIX Version 4.2.1
+  * GNU C++ 2.7.2                 Intel- or Sparc-based OS
+  * GNU C++ 2.8.1                 Any supported OS
+  * EGCS C++ 1.0.2                Any supported OS
+  * Visual C++ 4.2/5.0		  Windows NT 4.0
+  * Visual C++ 4.2/5.0		  Windows 95
+
+- ORBacus for Java:
+  * SUN's JDK 1.1.x or compatible
+
+For more information on ORBacus, please see the ORBacus manual or
+visit the ORBacus Home Page at http://www.ORBacus.com.
+
+For installation instructions, please see the file ../INSTALL.
diff --git a/devel/ORBacus/pkg-plist b/devel/ORBacus/pkg-plist
index b5b4094a59a0..ff7e1f46ee4c 100644
--- a/devel/ORBacus/pkg-plist
+++ b/devel/ORBacus/pkg-plist
@@ -4,43 +4,68 @@ include/OB/Basic.h
 include/OB/CORBA.h
 include/OB/Config.h
 include/OB/Context.h
+include/OB/Current.h
 include/OB/DII.h
 include/OB/DSI.h
+include/OB/Declarations.h
+include/OB/DynAny.h
 include/OB/Environment.h
 include/OB/Except.h
+include/OB/GIOP.h
+include/OB/IIOP.h
 include/OB/IOP.h
-include/OB/IOP.idl
 include/OB/ImplRep.h
-include/OB/ImplRep.idl
 include/OB/IntRep.h
-include/OB/IntRep.idl
 include/OB/IntRepMember.h
-include/OB/IntRepMember.idl
 include/OB/IntRepMember_skel.h
 include/OB/IntRep_skel.h
 include/OB/NamedValue.h
 include/OB/Narrow_impl.h
+include/OB/Net.h
+include/OB/OBPolicies.h
+include/OB/OCI.h
+include/OB/OCIBuffer.h
+include/OB/OCI_IIOP.h
 include/OB/ORB.h
 include/OB/Object.h
+include/OB/Object_skel.h
+include/OB/Policy.h
+include/OB/PolicyManager.h
 include/OB/Principal.h
 include/OB/Reactor.h
+include/OB/TCKind.h
 include/OB/Template.h
 include/OB/TemplateI.h
+include/OB/Timer.h
 include/OB/TypeCode.h
 include/OB/Util.h
-include/OB/Windows.h
 include/OB/X11.h
 include/OB/CosNaming.h
-lib/libOB.a
-lib/libOBX11.a
-lib/libIDL.a
+include/OB/CosNaming_skel.h
+include/OB/CosProperty.h
+include/OB/CosProperty_skel.h
+include/OB/CosEventComm.h
+include/OB/CosEventComm_skel.h
+include/OB/CosEventChannelAdmin.h
+include/OB/CosEventChannelAdmin_skel.h
 bin/idl
+bin/jidl
+bin/hidl
+bin/ridl
 bin/irserv
 bin/irfeed
+bin/irdel
 bin/irgen
+bin/idlcpp
+bin/iordump
+bin/nameserv
+bin/propserv
+bin/eventserv
+lib/libOBTest.a
+lib/libOB.a
+lib/libOBX11.a
+lib/libIDL.a
 lib/libCosNaming.a
-bin/nsserv
+lib/libCosProperty.a
+lib/libCosEvent.a
 man/man1/idl.1.gz
-share/doc/omniBroker/LICENSE
-@dirrm share/doc/omniBroker
-@dirrm include/OB