9 files changed, 341 insertions, 237 deletions

diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile
index 4f220749379f..95096518f994 100644
--- a/devel/omniORB/Makefile
+++ b/devel/omniORB/Makefile
@@ -6,79 +6,50 @@
 #
 
 PORTNAME=	omniORB
-PORTVERSION=	3.0.5
+PORTVERSION=	4.0.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	omniorb
-DISTNAME=	${PORTNAME}_${PORTVERSION:S/.//g}
+MASTER_SITE_SUBDIR=	${PORTNAME:L}
 
-MAINTAINER=	ejc@bazzle.com
-
-MAN1=		catior.1 genior.1 nameclt.1 obuildtree.1 ols.1 omake.1 \
-		omniNames.1 opriv.1 oshadow.1
-
-WRKSRC=		${WRKDIR}/omni
-BUILD_WRKSRC=	${WRKSRC}/src
+MAINTAINER=	ejc@FreeBSD.org
 
+CONFIGURE_WRKSRC=	${WRKSRC}/build
+BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
+INSTALL_WRKSRC=	${CONFIGURE_WRKSRC}
 USE_PYTHON=	yes
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 NO_FILTER_SHLIBS=	yes
 MAKEFILE=	GNUmakefile
-ALL_TARGET=	export
-MAKE_ENV+=	CDEBUGFLAGS="${CFLAGS}" CXXDEBUGFLAGS="${CXXFLAGS}" \
-		BSD_INSTALL="${INSTALL}" PYTHON_CMD="${PYTHON_CMD}" \
-		MKDIR="${MKDIR}"
-ONLY_FOR_ARCHS=	i386
-
-# Setting ${CONFIG_TARGET} to this value  and patching it into
-# ${WRKSRC}/config/config.mk via the post-patch target ensures that the
-# internal make variable __OSVERSION__ is set to 4.  This activates gcc
-# 2.9.5-specific code, and obviates the need for most of the patches
-# previously required since there are now version checks in the source.
-CONFIG_TARGET=	x86_freebsd_4.0
-
-CPIO=		cpio --quiet -pdum -R
+CONFIGURE_SCRIPT=	../configure
+CONFIGURE_ENV+=	CC=${CC} CFLAGS="${CFLAGS}" CXX=${CXX} CXXFLAGS="${CXXFLAGS}" \
+		CPP=${CPP} PYTHON=${PYTHON_CMD}
+CONFIGURE_ARGS=	--datadir=${DATADIR} --with-openssl=/usr \
+		--with-omniORB-config=${PREFIX}/etc/omniORB.cfg \
+		--with-omniNames-logdir=/var/log
+.if defined(WITHOUT_STATIC)
+CONFIGURE_ARGS+=	--disable-static
+PLIST_SUB+=	STATIC="@comment "
+.else
+PLIST_SUB+=	STATIC=""
+.endif
 
-post-patch:
-	@${SETENV} LANG=C ${PERL} -pi -e 's/__PLATFORM__/${CONFIG_TARGET}/;' \
-		${WRKSRC}/config/config.mk
+MAN1=		catior.1 genior.1 nameclt.1 obuildtree.1 ols.1 omake.1 \
+		omniNames.1 opriv.1 oshadow.1
 
-binfiles=	catior convertior genior nameclt omkdepend omniMapper \
-		omniNames
-scriptfiles=	omniidl omniidlrun.py
+pre-configure:
+	@ ${MKDIR} ${CONFIGURE_WRKSRC}
 
-do-install:
-.for binfile in ${binfiles}
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${CONFIG_TARGET}/${binfile} \
-		${PREFIX}/bin
-.endfor
-.for scriptfile in ${scriptfiles}
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/${CONFIG_TARGET}/${scriptfile} \
-		${PREFIX}/bin
-.endfor
-	cd ${WRKSRC}/lib/${CONFIG_TARGET} && \
-		find . | ${CPIO} ${BINOWN}:${BINGRP} ${PREFIX}/lib
-.for m in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/man/man1/${m} ${PREFIX}/man/man1
+post-install:
+.for manpage in ${MAN1}
+	@ ${INSTALL_MAN} ${WRKSRC}/man/man1/${manpage} ${MANPREFIX}/man/man1
 .endfor
-	${MKDIR} ${PREFIX}/include/omniORB3
-	${MKDIR} ${PREFIX}/include/omnithread
-	${INSTALL_DATA} ${WRKSRC}/include/omnithread.h ${PREFIX}/include
-	cd ${WRKSRC}/include && ( \
-		${INSTALL_DATA} omnithread/* ${PREFIX}/include/omnithread; \
-		${INSTALL_DATA} omniORB3/* ${PREFIX}/include/omniORB3 )
-	cd ${WRKSRC}/lib/python && \
-		find . | ${CPIO} ${SHAREOWN}:${SHAREGRP} ${PYTHON_SITELIBDIR}
-	@ cd ${.CURDIR}
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.unix ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.FreeBSD ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/ReleaseNote_omniORB_${PORTVERSION:S/.//g} \
-		${DOCSDIR}
-	cd ${WRKSRC}/doc && \
-		find . | ${CPIO} ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
+	@ ${MKDIR} ${DOCSDIR}
+	@ cd ${WRKSRC} && ${INSTALL_DATA} COPYING README.FIRST README.unix \
+	  ReleaseNotes_${PORTVERSION}.txt ${DOCSDIR}
+	@ ${TAR} cCf ${WRKSRC}/doc - . | ${TAR} xUCf ${DOCSDIR} -
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/omniORB/distinfo b/devel/omniORB/distinfo
index c44e7021fa82..b785ad6fef20 100644
--- a/devel/omniORB/distinfo
+++ b/devel/omniORB/distinfo
@@ -1 +1 @@
-MD5 (omniORB_305.tar.gz) = 49c6949e7508524e0c27cf68287c4dc9
+MD5 (omniORB-4.0.0.tar.gz) = c5dbd122c992ea1df4f6adf5e72644b1
diff --git a/devel/omniORB/files/patch-aa b/devel/omniORB/files/patch-aa
deleted file mode 100644
index bbcd8b538f0a..000000000000
--- a/devel/omniORB/files/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
diff --git a/devel/omniORB/files/patch-aj b/devel/omniORB/files/patch-aj
deleted file mode 100644
index f9e59ad7ae2d..000000000000
--- a/devel/omniORB/files/patch-aj
+++ /dev/null
@@ -1,58 +0,0 @@
---- 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.
- 
--#PYTHON = /usr/local/bin/python
-+PYTHON = ${PYTHON_CMD}
- 
- 
- #
-@@ -25,12 +25,13 @@
- #
- 
- AR = ar cq
-+MKDIRHIER=	${MKDIR}
- 
- CPP = /usr/libexec/cpp
- 
--CXX = g++
-+CXX ?= g++
- CXXMAKEDEPEND += -D__cplusplus -D__GNUG__ -D__GNUC__
--CXXDEBUGFLAGS = -O2
-+CXXDEBUGFLAGS ?= -O2
- 
- CXXLINK		= $(CXX) -pthread -s
- CXXLINKOPTIONS  = $(CXXDEBUGFLAGS) $(CXXOPTIONS)
-@@ -39,14 +40,14 @@
- EgcsMajorVersion = 1
- EgcsMinorVersion = 1        # This is actually a post-1.0 egcs snapshot.
- 
--CC           = gcc
-+CC           ?= gcc
- CMAKEDEPEND  += -D__GNUC__
--CDEBUGFLAGS  = -O2
-+CDEBUGFLAGS  ?= -O2
- 
- CLINK        = $(CC)
- CLINKOPTIONS = $(CDEBUGFLAGS) $(COPTIONS)
- 
--INSTALL = install -c
-+INSTALL = ${BSD_INSTALL} -c
- 
- IMPORT_CPPFLAGS += -D__x86__ -D__freebsd__ -D__OSVERSION__=4
- 
-@@ -72,10 +73,10 @@
- # Default location of the omniORB configuration file [falls back to this if
- # the environment variable OMNIORB_CONFIG is not set] :
- 
--OMNIORB_CONFIG_DEFAULT_LOCATION = /etc/omniORB.cfg
-+OMNIORB_CONFIG_DEFAULT_LOCATION = ${PREFIX}/etc/omniORB.cfg
- 
- # Default directory for the omniNames log files.
--OMNINAMES_LOG_DEFAULT_LOCATION = /var/omninames
-+OMNINAMES_LOG_DEFAULT_LOCATION = /var/log/omninames
- 
- # Uncomment the following if you want all utils and examples build in
- # this tree to statically linke with the omniORB libraries.
diff --git a/devel/omniORB/files/patch-idl::COS::Gnumakefile.in b/devel/omniORB/files/patch-idl::COS::Gnumakefile.in
new file mode 100644
index 000000000000..18f578c0bcab
--- /dev/null
+++ b/devel/omniORB/files/patch-idl::COS::Gnumakefile.in
@@ -0,0 +1,11 @@
+--- idl/COS/GNUmakefile.in.orig	Sun Aug 18 17:38:33 2002
++++ idl/COS/GNUmakefile.in	Fri Oct 18 20:27:23 2002
+@@ -4,7 +4,7 @@
+ VPATH=@srcdir@
+ INSTALL=@INSTALL@
+ 
+-INSTALLDIR = $(INSTALLIDLDIR)/omniORB/COS
++INSTALLDIR = $(INSTALLIDLDIR)/COS
+ 
+ FILES = AttNotifyChannelAdmin.idl CosCollection.idl			\
+         CosCompoundLifeCycle.idl CosConcurrencyControl.idl		\
diff --git a/devel/omniORB/files/patch-idl::Gnumakefile.in b/devel/omniORB/files/patch-idl::Gnumakefile.in
new file mode 100644
index 000000000000..d0aa376f299c
--- /dev/null
+++ b/devel/omniORB/files/patch-idl::Gnumakefile.in
@@ -0,0 +1,11 @@
+--- idl/GNUmakefile.in.orig	Sun Aug 18 17:38:33 2002
++++ idl/GNUmakefile.in	Fri Oct 18 17:32:26 2002
+@@ -4,7 +4,7 @@
+ VPATH=@srcdir@
+ INSTALL=@INSTALL@
+ 
+-INSTALLDIR = $(INSTALLIDLDIR)/omniORB
++INSTALLDIR = $(INSTALLIDLDIR)
+ 
+ FILES = Naming.idl bootstrap.idl corbaidl.idl echo.idl ir.idl orb.idl \
+         poa.idl poa_include.idl
diff --git a/devel/omniORB/pkg-comment b/devel/omniORB/pkg-comment
index 7e6fd402413c..f405edaf64f8 100644
--- a/devel/omniORB/pkg-comment
+++ b/devel/omniORB/pkg-comment
@@ -1 +1 @@
-A CORBA 2 implementation
+A robust high performance CORBA ORB for C++ and Python
diff --git a/devel/omniORB/pkg-descr b/devel/omniORB/pkg-descr
index d5ada056ed88..9ed8caea353f 100644
--- a/devel/omniORB/pkg-descr
+++ b/devel/omniORB/pkg-descr
@@ -1,24 +1,24 @@
-omniORB3 is a GPL'd Object Request Broker (ORB) which implements
-specification 2.3 of the Common Object Request Broker Architecture (CORBA).
-Further information on CORBA can be found at http://www.omg.org/
+omniORB is a GPL'd Object Request Broker (ORB) which implements
+specification 2.6 of the Common Object Request Broker Architecture (CORBA).
 
-> TECHNICAL FEATURES:
+* Technical Highlights
 - C++ language bindings are supported. The mapping conforms to the latest
-  revision of the CORBA specification. 
+  revision of the CORBA specification.
 - Support for the Portable Object Adapter (POA)
 - Support for the Interoperable Naming Service (INS)
-- The Internet Inter-ORB Protocol (IIOP 1.0) is used as the native protocol. 
-- The omniORB3 runtime is fully multithreaded. It uses native platform thread
-  support encapsulated with a small class library, omnithread, to abstract
-  away from differences in native thread APIs. 
-- TypeCode and type Any are supported. 
-- DynAny is supported (CORBA 2.2) 
-- The Dynamic Invocation and Dynamic Skeleton interfaces are supported 
+- The Internet Inter-ORB Protocol (IIOP 1.2) is used as the native protocol.
+- The omniORB runtime is fully multithreaded.
+- TypeCode and type Any are supported.
+- DynAny is supported.
+- The Dynamic Invocation and Dynamic Skeleton interfaces are supported.
 - A COS Naming Service, omniNames, is provided. 
-> FEATURES STILL TO BE IMPLEMENTED:
-- Support for IDL type longdouble, wchar, wstring, fixed, valuetype.
-> MISSING FEATURES:
-- omniORB3 does not has its own Interface Repository. However any CORBA
-  compliant Interface Repository can be used with omniORB3. 
 
-WWW: http://www.uk.research.att.com/omniORB/
+* Work in progress
+- Objects by value.
+- Portable Interceptors.
+
+* Missing features
+- omniORB does not has its own Interface Repository. However, the omniifr
+  project aims to create one.
+
+WWW: http://omniorb.sourceforge.net/
diff --git a/devel/omniORB/pkg-plist b/devel/omniORB/pkg-plist
index 0604e0ab9eef..61efcf3e4cf4 100644
--- a/devel/omniORB/pkg-plist
+++ b/devel/omniORB/pkg-plist
@@ -1,6 +1,7 @@
-%%PORTDOCS%%share/doc/omniORB/README.FreeBSD
+%%PORTDOCS%%share/doc/omniORB/COPYING
+%%PORTDOCS%%share/doc/omniORB/README.FIRST
 %%PORTDOCS%%share/doc/omniORB/README.unix
-%%PORTDOCS%%share/doc/omniORB/ReleaseNote_omniORB_305
+%%PORTDOCS%%share/doc/omniORB/ReleaseNotes_4.0.0.txt
 %%PORTDOCS%%share/doc/omniORB/omniNames.html
 %%PORTDOCS%%share/doc/omniORB/omniNames.pdf
 %%PORTDOCS%%share/doc/omniORB/omniNames.ps
@@ -21,8 +22,6 @@
 %%PORTDOCS%%share/doc/omniORB/omniORB/omniORB010.html
 %%PORTDOCS%%share/doc/omniORB/omniORB/omniORB011.html
 %%PORTDOCS%%share/doc/omniORB/omniORB/omniORB012.html
-%%PORTDOCS%%share/doc/omniORB/omniORB/omniORB013.html
-%%PORTDOCS%%share/doc/omniORB/omniORB/omniORB014.html
 %%PORTDOCS%%share/doc/omniORB/omniORB/previous_motif.gif
 %%PORTDOCS%%share/doc/omniORB/omniidl.html
 %%PORTDOCS%%share/doc/omniORB/omniidl.pdf
@@ -32,16 +31,23 @@
 %%PORTDOCS%%share/doc/omniORB/omnithread.ps
 %%PORTDOCS%%share/doc/omniORB/tex/cover.tex
 %%PORTDOCS%%share/doc/omniORB/tex/ode.tex
+%%PORTDOCS%%share/doc/omniORB/tex/omniNames.tex
 %%PORTDOCS%%share/doc/omniORB/tex/omniORB.bib
 %%PORTDOCS%%share/doc/omniORB/tex/omniORB.tex
 %%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
+%%STATIC%%lib/libCOS4.a
+%%STATIC%%lib/libCOSDynamic4.a
+%%STATIC%%lib/libomniCodeSets4.a
+%%STATIC%%lib/libomniDynamic4.a
+%%STATIC%%lib/libomniORB4.a
+%%STATIC%%lib/libomnisslTP.a
+%%STATIC%%lib/libomnithread.a
 bin/catior
 bin/convertior
 bin/genior
@@ -49,55 +55,166 @@ bin/nameclt
 bin/omkdepend
 bin/omniMapper
 bin/omniNames
+bin/omnicpp
 bin/omniidl
 bin/omniidlrun.py
-include/omniORB3/CORBA.h
-include/omniORB3/CORBA_basetypes.h
-include/omniORB3/CORBA_sysdep.h
-include/omniORB3/CORBA_vartypes.h
-include/omniORB3/GIOP.h
-include/omniORB3/IIOP.h
-include/omniORB3/IOP.h
-include/omniORB3/Naming.hh
-include/omniORB3/boa.h
-include/omniORB3/bufferedStream.h
-include/omniORB3/callDescriptor.h
-include/omniORB3/corba_operators.h
-include/omniORB3/corbaidl_defs.hh
-include/omniORB3/corbaidl_operators.hh
-include/omniORB3/corbaidl_poa.hh
-include/omniORB3/giopDriver.h
-include/omniORB3/ir_defs.hh
-include/omniORB3/ir_operators.hh
-include/omniORB3/ir_poa.hh
-include/omniORB3/omniInternal.h
-include/omniORB3/omniLifeCycle.hh
-include/omniORB3/omniORB.h
-include/omniORB3/omniObjKey.h
-include/omniORB3/omniObjRef.h
-include/omniORB3/omniServant.h
-include/omniORB3/omniURI.h
-include/omniORB3/poa.h
-include/omniORB3/poa_defs.h
-include/omniORB3/poa_operators.h
-include/omniORB3/poa_poa.h
-include/omniORB3/proxyFactory.h
-include/omniORB3/rope.h
-include/omniORB3/seqtemplates.h
-include/omniORB3/stringtypes.h
-include/omniORB3/stringtypes.h.old
-include/omniORB3/tcDescriptor.h
-include/omniORB3/templatedecls.h
-include/omniORB3/templatedefns.h
-include/omniORB3/tracedthread.h
-include/omniORB3/userexception.h
+include/COS/COS_sysdep.h
+include/COS/CosEventChannelAdmin.hh
+include/COS/CosEventComm.hh
+include/COS/CosLifeCycle.hh
+include/COS/CosNotification.hh
+include/COS/CosNotifyChannelAdmin.hh
+include/COS/CosNotifyComm.hh
+include/COS/CosNotifyFilter.hh
+include/COS/CosTime.hh
+include/COS/TimeBase.hh
+include/omniORB4/BiDirPolicy.h
+include/omniORB4/CORBA.h
+include/omniORB4/CORBA_Any.h
+include/omniORB4/CORBA_Any_vartypes.h
+include/omniORB4/CORBA_BOA.h
+include/omniORB4/CORBA_Context.h
+include/omniORB4/CORBA_Current.h
+include/omniORB4/CORBA_DomainManager.h
+include/omniORB4/CORBA_Environment.h
+include/omniORB4/CORBA_Exception.h
+include/omniORB4/CORBA_ExceptionList.h
+include/omniORB4/CORBA_Fixed.h
+include/omniORB4/CORBA_NamedValue.h
+include/omniORB4/CORBA_ORB.h
+include/omniORB4/CORBA_Object.h
+include/omniORB4/CORBA_Object_vartypes.h
+include/omniORB4/CORBA_Policy.h
+include/omniORB4/CORBA_Principal.h
+include/omniORB4/CORBA_Request.h
+include/omniORB4/CORBA_ServerRequest.h
+include/omniORB4/CORBA_String.h
+include/omniORB4/CORBA_TypeCode.h
+include/omniORB4/CORBA_TypeCode_member.h
+include/omniORB4/CORBA_UnknownUserException.h
+include/omniORB4/CORBA_basetypes.h
+include/omniORB4/CORBA_primitive_types.h
+include/omniORB4/CORBA_static_fns.h
+include/omniORB4/CORBA_sysdep.h
+include/omniORB4/CORBA_sysdep_auto.h
+include/omniORB4/CORBA_sysdep_trad.h
+include/omniORB4/CORBA_vartypes.h
+include/omniORB4/GIOP.h
+include/omniORB4/IIOP.h
+include/omniORB4/IOP.h
+include/omniORB4/IOP_C.h
+include/omniORB4/IOP_S.h
+include/omniORB4/Naming.hh
+include/omniORB4/acconfig.h
+include/omniORB4/boa.h
+include/omniORB4/callDescriptor.h
+include/omniORB4/callHandle.h
+include/omniORB4/cdrStream.h
+include/omniORB4/codeSets.h
+include/omniORB4/corba_operators.h
+include/omniORB4/corbaidl_defs.hh
+include/omniORB4/corbaidl_operators.hh
+include/omniORB4/corbaidl_poa.hh
+include/omniORB4/distdate.hh
+include/omniORB4/dynAny.h
+include/omniORB4/finalCleanup.h
+include/omniORB4/fixed.h
+include/omniORB4/giopEndpoint.h
+include/omniORB4/internal/GIOP_C.h
+include/omniORB4/internal/GIOP_S.h
+include/omniORB4/internal/SocketCollection.h
+include/omniORB4/internal/anonObject.h
+include/omniORB4/internal/anyP.h
+include/omniORB4/internal/codeSetUtil.h
+include/omniORB4/internal/context.h
+include/omniORB4/internal/corbaBoa.h
+include/omniORB4/internal/corbaOrb.h
+include/omniORB4/internal/deferredRequest.h
+include/omniORB4/internal/dynAnyImpl.h
+include/omniORB4/internal/dynamicImplementation.h
+include/omniORB4/internal/dynamicLib.h
+include/omniORB4/internal/excepthandler.h
+include/omniORB4/internal/exceptiondefs.h
+include/omniORB4/internal/giopBiDir.h
+include/omniORB4/internal/giopMonitor.h
+include/omniORB4/internal/giopRendezvouser.h
+include/omniORB4/internal/giopRope.h
+include/omniORB4/internal/giopServer.h
+include/omniORB4/internal/giopStrand.h
+include/omniORB4/internal/giopStream.h
+include/omniORB4/internal/giopStreamImpl.h
+include/omniORB4/internal/giopWorker.h
+include/omniORB4/internal/inProcessIdentity.h
+include/omniORB4/internal/initRefs.h
+include/omniORB4/internal/initialiser.h
+include/omniORB4/internal/invoker.h
+include/omniORB4/internal/libcWrapper.h
+include/omniORB4/internal/localIdentity.h
+include/omniORB4/internal/objectAdapter.h
+include/omniORB4/internal/objectStub.h
+include/omniORB4/internal/objectTable.h
+include/omniORB4/internal/omniCurrent.h
+include/omniORB4/internal/omniIdentity.h
+include/omniORB4/internal/orbOptions.h
+include/omniORB4/internal/orbParameters.h
+include/omniORB4/internal/poacurrentimpl.h
+include/omniORB4/internal/poaimpl.h
+include/omniORB4/internal/poamanager.h
+include/omniORB4/internal/pseudo.h
+include/omniORB4/internal/remoteIdentity.h
+include/omniORB4/internal/request.h
+include/omniORB4/internal/rmutex.h
+include/omniORB4/internal/shutdownIdentity.h
+include/omniORB4/internal/tcParser.h
+include/omniORB4/internal/transportRules.h
+include/omniORB4/internal/typecode.h
+include/omniORB4/ir_defs.hh
+include/omniORB4/ir_operators.hh
+include/omniORB4/ir_poa.hh
+include/omniORB4/linkHacks.h
+include/omniORB4/local_config.h
+include/omniORB4/minorCode.h
+include/omniORB4/objTracker.h
+include/omniORB4/omniAsyncInvoker.h
+include/omniORB4/omniIOR.h
+include/omniORB4/omniInterceptors.h
+include/omniORB4/omniInternal.h
+include/omniORB4/omniORB.h
+include/omniORB4/omniORBcompat.h
+include/omniORB4/omniObjKey.h
+include/omniORB4/omniObjRef.h
+include/omniORB4/omniPolicy.h
+include/omniORB4/omniServant.h
+include/omniORB4/omniServer.h
+include/omniORB4/omniTransport.h
+include/omniORB4/omniURI.h
+include/omniORB4/omniutilities.h
+include/omniORB4/optionalFeatures.h
+include/omniORB4/poa.h
+include/omniORB4/poa_defs.h
+include/omniORB4/poa_operators.h
+include/omniORB4/poa_poa.h
+include/omniORB4/proxyFactory.h
+include/omniORB4/seqTemplatedecls.h
+include/omniORB4/seqTemplatedefns.h
+include/omniORB4/sslContext.h
+include/omniORB4/stringtypes.h
+include/omniORB4/tcDescriptor.h
+include/omniORB4/templatedecls.h
+include/omniORB4/templatedefns.h
+include/omniORB4/tracedthread.h
+include/omniORB4/userexception.h
+include/omniORB4/wstringtypes.h
+include/omniconfig.h
 include/omnithread.h
 include/omnithread/mach.h
 include/omnithread/nt.h
 include/omnithread/posix.h
 include/omnithread/pthread_nt.h
 include/omnithread/solaris.h
-include/omnithread/os2_impl.h
+lib/%%PYTHON_VERSION%%/site-packages/_omniidlmodule.so
+lib/%%PYTHON_VERSION%%/site-packages/_omniidlmodule.so.1
+lib/%%PYTHON_VERSION%%/site-packages/_omniidlmodule.so.1.0
 lib/%%PYTHON_VERSION%%/site-packages/omniidl/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/omniidl/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/omniidl/idlast.py
@@ -116,8 +233,16 @@ lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/ast.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/ast.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/call.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/call.pyc
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/config.py
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/config.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/cxx.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/cxx.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/descriptor.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/descriptor.pyc
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/dynskel/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/dynskel/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/dynskel/main.py
@@ -128,8 +253,6 @@ lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/dynskel/template.py
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/dynskel/template.pyc
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/dynskel/typecode.py
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/dynskel/typecode.pyc
-lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/env.py
-lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/env.pyc
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/header/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/header/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/header/defs.py
@@ -150,26 +273,24 @@ lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/header/tie.py
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/header/tie.pyc
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/id.py
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/id.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/iface.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/iface.pyc
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/impl/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/impl/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/impl/main.py
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/impl/main.pyc
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/impl/template.py
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/impl/template.pyc
-lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/name.py
-lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/name.pyc
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/output.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/output.pyc
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skel/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skel/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skel/dispatch.py
-lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skel/dispatch.pyc
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skel/main.py
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skel/main.pyc
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skel/mangler.py
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skel/mangler.pyc
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skel/poa.py
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skel/poa.pyc
-lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skel/proxy.py
-lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skel/proxy.pyc
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skel/template.py
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skel/template.pyc
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skutil.py
@@ -178,48 +299,104 @@ lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/support.py
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/support.pyc
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/types.py
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/types.pyc
-lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/tyutil.py
-lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/tyutil.pyc
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/util.py
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/util.pyc
 lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/dump.py
 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/_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.5
-lib/libCOSBOA3.a
-lib/libCOSBOA3.so
-lib/libCOSBOA3.so.0
-lib/libCOSBOA3.so.0.5
-lib/libCOSDynamic3.a
-lib/libCOSDynamic3.so
-lib/libCOSDynamic3.so.0
-lib/libCOSDynamic3.so.0.5
-lib/libomniDynamic3.a
-lib/libomniDynamic3.so
-lib/libomniDynamic3.so.0
-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.5
-lib/libomnithread.a
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/interactive.py
+lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/interactive.pyc
+lib/libCOS4.so
+lib/libCOS4.so.0
+lib/libCOS4.so.0.0
+lib/libCOSDynamic4.so
+lib/libCOSDynamic4.so.0
+lib/libCOSDynamic4.so.0.0
+lib/libomniCodeSets4.so
+lib/libomniCodeSets4.so.0
+lib/libomniCodeSets4.so.0.0
+lib/libomniDynamic4.so
+lib/libomniDynamic4.so.0
+lib/libomniDynamic4.so.0.0
+lib/libomniORB4.so
+lib/libomniORB4.so.0
+lib/libomniORB4.so.0.0
+lib/libomnisslTP.so
+lib/libomnisslTP.so.4
+lib/libomnisslTP.so.4.0
 lib/libomnithread.so
-lib/libomnithread.so.2
-lib/libomnithread.so.2.1
-lib/libtcpwrapGK.a
-lib/libtcpwrapGK.so
-lib/libtcpwrapGK.so.2
-lib/libtcpwrapGK.so.2.0
-lib/omnicpp
+lib/libomnithread.so.3
+lib/libomnithread.so.3.0
+share/omniORB/idl/COS/AttNotifyChannelAdmin.idl
+share/omniORB/idl/COS/CosCollection.idl
+share/omniORB/idl/COS/CosCompoundLifeCycle.idl
+share/omniORB/idl/COS/CosConcurrencyControl.idl
+share/omniORB/idl/COS/CosContainment.idl
+share/omniORB/idl/COS/CosEventChannelAdmin.idl
+share/omniORB/idl/COS/CosEventComm.idl
+share/omniORB/idl/COS/CosExternalization.idl
+share/omniORB/idl/COS/CosExternalizationContainment.idl
+share/omniORB/idl/COS/CosExternalizationReference.idl
+share/omniORB/idl/COS/CosGraphs.idl
+share/omniORB/idl/COS/CosLicensingManager.idl
+share/omniORB/idl/COS/CosLifeCycle.idl
+share/omniORB/idl/COS/CosLifeCycleContainment.idl
+share/omniORB/idl/COS/CosLifeCycleReference.idl
+share/omniORB/idl/COS/CosNaming.idl
+share/omniORB/idl/COS/CosNotification.idl
+share/omniORB/idl/COS/CosNotifyChannelAdmin.idl
+share/omniORB/idl/COS/CosNotifyComm.idl
+share/omniORB/idl/COS/CosNotifyFilter.idl
+share/omniORB/idl/COS/CosObjectIdentity.idl
+share/omniORB/idl/COS/CosPersistenceDDO.idl
+share/omniORB/idl/COS/CosPersistenceDS_CLI.idl
+share/omniORB/idl/COS/CosPersistencePDS.idl
+share/omniORB/idl/COS/CosPersistencePDS_DA.idl
+share/omniORB/idl/COS/CosPersistencePID.idl
+share/omniORB/idl/COS/CosPersistencePO.idl
+share/omniORB/idl/COS/CosPersistencePOM.idl
+share/omniORB/idl/COS/CosPropertyService.idl
+share/omniORB/idl/COS/CosQuery.idl
+share/omniORB/idl/COS/CosQueryCollection.idl
+share/omniORB/idl/COS/CosReference.idl
+share/omniORB/idl/COS/CosRelationships.idl
+share/omniORB/idl/COS/CosStream.idl
+share/omniORB/idl/COS/CosTSPortability.idl
+share/omniORB/idl/COS/CosTime.idl
+share/omniORB/idl/COS/CosTimerEvent.idl
+share/omniORB/idl/COS/CosTrading.idl
+share/omniORB/idl/COS/CosTradingDynamic.idl
+share/omniORB/idl/COS/CosTradingRepos.idl
+share/omniORB/idl/COS/CosTransactions.idl
+share/omniORB/idl/COS/CosTypedEventChannelAdmin.idl
+share/omniORB/idl/COS/CosTypedEventComm.idl
+share/omniORB/idl/COS/CosTypedNotifyChannelAdmin.idl
+share/omniORB/idl/COS/CosTypedNotifyComm.idl
+share/omniORB/idl/COS/DCE_CIOPSecurity.idl
+share/omniORB/idl/COS/LifeCycleService.idl
+share/omniORB/idl/COS/Lname-library.idl
+share/omniORB/idl/COS/NRService.idl
+share/omniORB/idl/COS/RDITestTypes.idl
+share/omniORB/idl/COS/SECIOP.idl
+share/omniORB/idl/COS/SSLIOP.idl
+share/omniORB/idl/COS/Security.idl
+share/omniORB/idl/COS/SecurityAdmin.idl
+share/omniORB/idl/COS/SecurityLevel1.idl
+share/omniORB/idl/COS/SecurityLevel2.idl
+share/omniORB/idl/COS/SecurityReplaceable.idl
+share/omniORB/idl/COS/TimeBase.idl
+share/omniORB/idl/Naming.idl
+share/omniORB/idl/bootstrap.idl
+share/omniORB/idl/corbaidl.idl
+share/omniORB/idl/echo.idl
+share/omniORB/idl/ir.idl
+share/omniORB/idl/orb.idl
+share/omniORB/idl/poa.idl
+share/omniORB/idl/poa_include.idl
+@dirrm share/omniORB/idl/COS
+@dirrm share/omniORB/idl
+@dirrm share/omniORB
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/skel
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/impl
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/omniidl_be/cxx/header
@@ -228,7 +405,9 @@ lib/omnicpp
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/omniidl_be
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/omniidl
 @dirrm include/omnithread
-@dirrm include/omniORB3
+@dirrm include/omniORB4/internal
+@dirrm include/omniORB4
+@dirrm include/COS
 %%PORTDOCS%%@dirrm share/doc/omniORB/tex
 %%PORTDOCS%%@dirrm share/doc/omniORB/omniORB
 %%PORTDOCS%%@dirrm share/doc/omniORB