- Recopy devel/omniORB to devel/omniORB-4.1

- Downgrade it to 4.1.7

- Unbreak devel/omniNotify

- Add CONFLICTS

CR:		D970
Approved by:	pfg

14 files changed, 639 insertions, 22 deletions

diff --git a/devel/Makefile b/devel/Makefile
index 3020f725fd2b..2d0f25174cfe 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1371,6 +1371,7 @@
     SUBDIR += omake
     SUBDIR += omniNotify
     SUBDIR += omniORB
+    SUBDIR += omniORB-4.1
     SUBDIR += oniguruma
     SUBDIR += oniguruma4
     SUBDIR += oniguruma5
diff --git a/devel/omniNotify/Makefile b/devel/omniNotify/Makefile
index 3db0fbde74b0..7647b7d8e462 100644
--- a/devel/omniNotify/Makefile
+++ b/devel/omniNotify/Makefile
@@ -13,18 +13,15 @@ COMMENT=	CORBA Notification Service (CosNotification) for omniORB
 
 LICENSE=	GPLv2
 
-BROKEN=		Fails to build with new omniORB
-
-LIB_DEPENDS=	libomniORB4.so:${PORTSDIR}/devel/omniORB
-RUN_DEPENDS=	omniidl:${PORTSDIR}/devel/omniORB
-# parts of omniORB4 source tree is required to build
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/devel/omniORB:patch
+LIB_DEPENDS=	libomniORB4.so:${PORTSDIR}/devel/omniORB-4.1
+# parts of omniORB4-4.1 source tree is required to build
+BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/devel/omniORB-4.1:patch
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 CONFIGURE_WRKSRC=	${WRKSRC}/build
 BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
 INSTALL_WRKSRC=	${CONFIGURE_WRKSRC}
-OMNIORB_WRKSRC=	`cd ${PORTSDIR}/devel/omniORB && ${MAKE} -V WRKSRC`
+OMNIORB_WRKSRC=	`cd ${PORTSDIR}/devel/omniORB-4.1 && ${MAKE} -V WRKSRC`
 
 USES=		gmake python
 GNU_CONFIGURE=	yes
@@ -36,16 +33,19 @@ CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD}
 CONFIGURE_ARGS=	--with-omniorb=${LOCALBASE}
 OPTIONS_DEFINE=	EXAMPLES
 
-pre-configure:
-	@${MKDIR} ${CONFIGURE_WRKSRC}
-	@cd ${OMNIORB_WRKSRC} && ${FIND} idl | ${CPIO} --quiet -pdum ${WRKSRC}
+.include <bsd.port.options.mk>
 
-post-patch:
-	@${REINPLACE_CMD} -Ee 's/-O2/${CFLAGS}/' \
+pre-configure:
+	${REINPLACE_CMD} -Ee 's|-O2|${CFLAGS}|' \
 		${WRKSRC}/mk/beforeauto.mk.in
+	${MKDIR} ${CONFIGURE_WRKSRC}
+	cd ${OMNIORB_WRKSRC} && ${FIND} idl | ${CPIO} --quiet -pdum ${WRKSRC}
 
 post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notifd
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	@cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} "! ( -name \.cvsignore -o -name *\.orig )"
+	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} "! ( -name \.cvsignore -o -name *\.orig )"
+.endif
 
 .include <bsd.port.mk>
diff --git a/devel/omniNotify/pkg-plist b/devel/omniNotify/pkg-plist
index 0f757f69b716..588d963dda65 100644
--- a/devel/omniNotify/pkg-plist
+++ b/devel/omniNotify/pkg-plist
@@ -216,12 +216,3 @@ lib/libCOSNotify4.so.0.1
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/struct_push_consumer.cc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/struct_push_supplier.cc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ten_any_pull_consumers.cc
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/cosnotify_tests/idl
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/cosnotify_tests/Utils
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/cosnotify_tests/Stubs
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/cosnotify_tests/Helpers
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/cosnotify_tests/Config
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/cosnotify_tests/Clients
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/cosnotify_tests
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrm include/omniNotify
diff --git a/devel/omniORB-4.1/Makefile b/devel/omniORB-4.1/Makefile
new file mode 100644
index 000000000000..d9a4492b1f66
--- /dev/null
+++ b/devel/omniORB-4.1/Makefile
@@ -0,0 +1,60 @@
+# Created by: ejc@bazzle.com
+# $FreeBSD$
+
+PORTNAME=	omniORB
+PORTVERSION=	4.1.7
+CATEGORIES=	devel
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Robust high performance CORBA ORB for C++ and Python
+
+LICENSE=	GPLv2
+
+CONFLICTS=	omniORB-4.2.*
+
+PLIST_SUB+=	SONUM=${PORTVERSION:C/.*\.//}
+GNU_CONFIGURE=	yes
+USE_OPENSSL=	yes
+USES=		gmake pkgconfig python tar:bzip2
+USE_LDCONFIG=	yes
+MAKEFILE=	GNUmakefile
+CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD}
+CONFIGURE_ARGS=	--datadir=${DATADIR} --with-openssl=${OPENSSLBASE} \
+		--with-omniORB-config=${PREFIX}/etc/omniORB.cfg \
+		--with-omniNames-logdir=/var/log
+
+OPTIONS_DEFINE=	DOCS EXAMPLES STATIC
+OPTIONS_DEFAULT=	DOCS EXAMPLES STATIC
+OPTIONS_SUB=	yes
+STATIC_CONFIGURE_OFF=	--disable-static
+
+BINS=	catior convertior genior nameclt omkdepend omniMapper omniNames omnicpp
+
+.include <bsd.port.options.mk>
+
+pre-configure:
+	${REINPLACE_CMD} -e 's#-O2#${CFLAGS}#g' ${WRKSRC}/mk/beforeauto.mk.in
+	${REINPLACE_CMD} -e 's#%%STAGEDIR%%%%PREFIX%%#${STAGEDIR}${PREFIX}#g' \
+	       	${WRKSRC}/contrib/pkgconfig/GNUmakefile.in
+
+post-install:
+	${PYTHON_CMD} -c "import compileall; compileall.compile_dir('${STAGEDIR}${PYTHON_SITELIBDIR}/omniidl')"
+	${PYTHON_CMD} -c "import compileall; compileall.compile_dir('${STAGEDIR}${PYTHON_SITELIBDIR}/omniidl_be')"
+	cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} *.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	cd ${WRKSRC}/man/man8 && ${INSTALL_MAN} *.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
+.for bin in ${BINS}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${bin}
+.endfor
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} COPYING README.FIRST.txt README.unix \
+	 ReleaseNotes.txt ${STAGEDIR}${DOCSDIR}
+	${TAR} cCf ${WRKSRC}/doc - . | ${TAR} xUCf ${STAGEDIR}${DOCSDIR} -
+.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/sample.cfg ${STAGEDIR}${EXAMPLESDIR}/omniORB.cfg
+.endif
+
+.include <bsd.port.mk>
diff --git a/devel/omniORB-4.1/distinfo b/devel/omniORB-4.1/distinfo
new file mode 100644
index 000000000000..9467d7cfb288
--- /dev/null
+++ b/devel/omniORB-4.1/distinfo
@@ -0,0 +1,2 @@
+SHA256 (omniORB-4.1.7.tar.bz2) = 2c589ae4e1d814c81f994f1c3da10afb09e3173213b870e9056162b7331e273c
+SIZE (omniORB-4.1.7.tar.bz2) = 2625287
diff --git a/devel/omniORB-4.1/files/patch-configure b/devel/omniORB-4.1/files/patch-configure
new file mode 100644
index 000000000000..301c1c61ce55
--- /dev/null
+++ b/devel/omniORB-4.1/files/patch-configure
@@ -0,0 +1,12 @@
+--- configure.orig	2013-06-24 12:16:01.000000000 +0200
++++ configure	2014-10-19 21:25:59.000000000 +0200
+@@ -7254,6 +7254,9 @@
+   *-*-freebsd6*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="6";;
+   *-*-freebsd7*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="7";;
+   *-*-freebsd8*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="8";;
++  *-*-freebsd9*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="9";;
++  *-*-freebsd10*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="10";;
++  *-*-freebsd11*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="11";;
+   *-*-kfreebsd*) plat_name="kFreeBSD";  plat_def="__FreeBSD_kernel__";  os_v="6";;
+   *-*-netbsd*)   plat_name="NetBSD";   plat_def="__netbsd__";   os_v="1";;
+   *-*-openbsd*)  plat_name="OpenBSD";  plat_def="__openbsd__";  os_v="3";;
diff --git a/devel/omniORB-4.1/files/patch-contrib__pkgconfig__GNUmakefile.in b/devel/omniORB-4.1/files/patch-contrib__pkgconfig__GNUmakefile.in
new file mode 100644
index 000000000000..ea4b5982206c
--- /dev/null
+++ b/devel/omniORB-4.1/files/patch-contrib__pkgconfig__GNUmakefile.in
@@ -0,0 +1,11 @@
+--- contrib/pkgconfig/GNUmakefile.in.orig       Fri Jul 16 15:33:32 2004
++++ contrib/pkgconfig/GNUmakefile.in    Fri Jul 16 15:33:53 2004
+@@ -4,7 +4,7 @@
+ VPATH=@srcdir@
+ INSTALL=@INSTALL@
+
+-INSTALLDIR = $(INSTALLLIBDIR)/pkgconfig
++INSTALLDIR = %%STAGEDIR%%%%PREFIX%%/libdata/pkgconfig
+
+ PKGFILES = omnithread3.pc omniORB4.pc omniDynamic4.pc \
+            omniCOS4.pc omniCOSDynamic4.pc
diff --git a/devel/omniORB-4.1/files/patch-idl__COS__Gnumakefile.in b/devel/omniORB-4.1/files/patch-idl__COS__Gnumakefile.in
new file mode 100644
index 000000000000..18f578c0bcab
--- /dev/null
+++ b/devel/omniORB-4.1/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-4.1/files/patch-idl__Gnumakefile.in b/devel/omniORB-4.1/files/patch-idl__Gnumakefile.in
new file mode 100644
index 000000000000..d0aa376f299c
--- /dev/null
+++ b/devel/omniORB-4.1/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-4.1/files/patch-src_tool_omniidl_cxx_idlutil.cc b/devel/omniORB-4.1/files/patch-src_tool_omniidl_cxx_idlutil.cc
new file mode 100644
index 000000000000..ddc0a8557e1e
--- /dev/null
+++ b/devel/omniORB-4.1/files/patch-src_tool_omniidl_cxx_idlutil.cc
@@ -0,0 +1,19 @@
+--- 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 --git a/devel/omniORB-4.1/files/patch-undef_minor_macro b/devel/omniORB-4.1/files/patch-undef_minor_macro
new file mode 100644
index 000000000000..bf236574a953
--- /dev/null
+++ b/devel/omniORB-4.1/files/patch-undef_minor_macro
@@ -0,0 +1,30 @@
+--- src/appl/utils/catior/catior.cc.orig	Mon Nov  7 22:38:04 2005
++++ src/appl/utils/catior/catior.cc	Mon Nov  7 22:38:55 2005
+@@ -42,6 +42,12 @@
+ #  include <unistd.h>
+ #endif
+ 
++#ifdef minor
++  // Digital Unix 3.2, and may be others as well, defines minor() as
++  // a macro in its sys/types.h. Get rid of it!
++#undef minor
++#endif
++
+ #ifndef Swap16
+ #define Swap16(s) ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff))
+ #else
+--- src/appl/utils/convertior/convertior.cc.orig	Mon Nov  7 22:39:11 2005
++++ src/appl/utils/convertior/convertior.cc	Mon Nov  7 22:39:28 2005
+@@ -40,6 +40,12 @@
+ #  include <unistd.h>
+ #endif
+ 
++#ifdef minor
++  // Digital Unix 3.2, and may be others as well, defines minor() as
++  // a macro in its sys/types.h. Get rid of it!
++#undef minor
++#endif
++
+ #ifndef Swap16
+ #define Swap16(s) ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff))
+ #else
diff --git a/devel/omniORB-4.1/pkg-descr b/devel/omniORB-4.1/pkg-descr
new file mode 100644
index 000000000000..21211570e4a3
--- /dev/null
+++ b/devel/omniORB-4.1/pkg-descr
@@ -0,0 +1,10 @@
+omniORB is a robust high performance CORBA ORB for C++ and Python.
+
+It is freely available under the terms of the GNU Lesser General Public
+License (for the libraries), and GNU General Public License (for the tools).
+omniORB is largely CORBA 2.6 compliant.
+
+It offers mainly the same features as the port devel/omniORB, but this
+legacy version is compatible with devel/omniNotify.
+
+WWW: http://omniorb.sourceforge.net/
diff --git a/devel/omniORB-4.1/pkg-plist b/devel/omniORB-4.1/pkg-plist
new file mode 100644
index 000000000000..97725990f970
--- /dev/null
+++ b/devel/omniORB-4.1/pkg-plist
@@ -0,0 +1,458 @@
+bin/catior
+bin/convertior
+bin/genior
+bin/nameclt
+bin/omkdepend
+bin/omniMapper
+bin/omniNames
+bin/omnicpp
+bin/omniidl
+bin/omniidlrun.py
+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_AbstractBase.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_LocalObject.h
+include/omniORB4/CORBA_LocalObject_vartypes.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_ValueBase.h
+include/omniORB4/CORBA_ValueBase_vartypes.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/anyStream.h
+include/omniORB4/boa.h
+include/omniORB4/bootstrap.hh
+include/omniORB4/boxes_defs.hh
+include/omniORB4/boxes_operators.hh
+include/omniORB4/boxes_poa.hh
+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/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/giopStrandFlags.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/omniConnectionData.hh
+include/omniORB4/omniConnectionMgmt.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/omniTypedefs.hh
+include/omniORB4/omniURI.h
+include/omniORB4/omniZIOP.h
+include/omniORB4/omniutilities.h
+include/omniORB4/optionalFeatures.h
+include/omniORB4/poa.h
+include/omniORB4/poa_defs.h
+include/omniORB4/poa_enums_defs.hh
+include/omniORB4/poa_enums_operators.hh
+include/omniORB4/poa_enums_poa.hh
+include/omniORB4/poa_poa.h
+include/omniORB4/proxyFactory.h
+include/omniORB4/seqTemplatedecls.h
+include/omniORB4/seqTemplatedefns.h
+include/omniORB4/sslAddress.h
+include/omniORB4/sslConnection.h
+include/omniORB4/sslContext.h
+include/omniORB4/sslEndpoint.h
+include/omniORB4/sslTransportImpl.h
+include/omniORB4/streamOperators.h
+include/omniORB4/stringtypes.h
+include/omniORB4/tcpAddress.h
+include/omniORB4/tcpConnection.h
+include/omniORB4/tcpEndpoint.h
+include/omniORB4/tcpTransportImpl.h
+include/omniORB4/templatedecls.h
+include/omniORB4/templatedefns.h
+include/omniORB4/tracedthread.h
+include/omniORB4/unixAddress.h
+include/omniORB4/unixConnection.h
+include/omniORB4/unixEndpoint.h
+include/omniORB4/unixTransportImpl.h
+include/omniORB4/userexception.h
+include/omniORB4/valueFactoryManager.h
+include/omniORB4/valueTemplatedecls.h
+include/omniORB4/valueTemplatedefns.h
+include/omniORB4/valueType.h
+include/omniORB4/wstringtypes.h
+include/omniORB4/ziopStubs.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
+%%STATIC%%lib/libCOS4.a
+lib/libCOS4.so
+lib/libCOS4.so.1
+lib/libCOS4.so.1.%%SONUM%%
+%%STATIC%%lib/libCOSDynamic4.a
+lib/libCOSDynamic4.so
+lib/libCOSDynamic4.so.1
+lib/libCOSDynamic4.so.1.%%SONUM%%
+%%STATIC%%lib/libomniCodeSets4.a
+lib/libomniCodeSets4.so
+lib/libomniCodeSets4.so.1
+lib/libomniCodeSets4.so.1.%%SONUM%%
+%%STATIC%%lib/libomniConnectionMgmt4.a
+lib/libomniConnectionMgmt4.so
+lib/libomniConnectionMgmt4.so.1
+lib/libomniConnectionMgmt4.so.1.%%SONUM%%
+%%STATIC%%lib/libomniDynamic4.a
+lib/libomniDynamic4.so
+lib/libomniDynamic4.so.1
+lib/libomniDynamic4.so.1.%%SONUM%%
+%%STATIC%%lib/libomniORB4.a
+lib/libomniORB4.so
+lib/libomniORB4.so.1
+lib/libomniORB4.so.1.%%SONUM%%
+%%STATIC%%lib/libomnisslTP4.a
+lib/libomnisslTP4.so
+lib/libomnisslTP4.so.1
+lib/libomnisslTP4.so.1.%%SONUM%%
+%%STATIC%%lib/libomnithread.a
+lib/libomnithread.so
+lib/libomnithread.so.3
+lib/libomnithread.so.3.4
+%%PYTHON_SITELIBDIR%%/_omniidlmodule.so
+%%PYTHON_SITELIBDIR%%/_omniidlmodule.so.4
+%%PYTHON_SITELIBDIR%%/_omniidlmodule.so.4.1
+%%PYTHON_SITELIBDIR%%/omniidl/__init__.py
+%%PYTHON_SITELIBDIR%%/omniidl/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniidl/idlast.py
+%%PYTHON_SITELIBDIR%%/omniidl/idlast.pyc
+%%PYTHON_SITELIBDIR%%/omniidl/idlstring.py
+%%PYTHON_SITELIBDIR%%/omniidl/idlstring.pyc
+%%PYTHON_SITELIBDIR%%/omniidl/idltype.py
+%%PYTHON_SITELIBDIR%%/omniidl/idltype.pyc
+%%PYTHON_SITELIBDIR%%/omniidl/idlutil.py
+%%PYTHON_SITELIBDIR%%/omniidl/idlutil.pyc
+%%PYTHON_SITELIBDIR%%/omniidl/idlvisitor.py
+%%PYTHON_SITELIBDIR%%/omniidl/idlvisitor.pyc
+%%PYTHON_SITELIBDIR%%/omniidl/main.py
+%%PYTHON_SITELIBDIR%%/omniidl/main.pyc
+%%PYTHON_SITELIBDIR%%/omniidl/output.py
+%%PYTHON_SITELIBDIR%%/omniidl/output.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/__init__.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/__init__.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/ast.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/ast.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/call.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/call.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/config.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/config.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/cxx.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/cxx.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/descriptor.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/descriptor.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/dynskel/__init__.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/dynskel/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/dynskel/main.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/dynskel/main.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/dynskel/tcstring.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/dynskel/tcstring.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/dynskel/template.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/dynskel/template.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/dynskel/typecode.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/dynskel/typecode.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header/__init__.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header/defs.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header/defs.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header/forward.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header/forward.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header/marshal.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header/marshal.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header/obv.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header/obv.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header/opers.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header/opers.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header/poa.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header/poa.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header/tcstring.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header/tcstring.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header/template.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header/template.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header/tie.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header/tie.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/id.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/id.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/iface.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/iface.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/impl/__init__.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/impl/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/impl/main.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/impl/main.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/impl/template.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/impl/template.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/mapping.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/mapping.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/output.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/output.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/skel/__init__.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/skel/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/skel/main.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/skel/main.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/skel/mangler.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/skel/mangler.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/skel/poa.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/skel/poa.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/skel/template.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/skel/template.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/skutil.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/skutil.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/support.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/support.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/types.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/types.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/util.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/util.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/value.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/value.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/dump.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/dump.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/example.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/example.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/interactive.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/interactive.pyc
+libdata/pkgconfig/omniCOS4.pc
+libdata/pkgconfig/omniCOSDynamic4.pc
+libdata/pkgconfig/omniConnectionMgmt4.pc
+libdata/pkgconfig/omniDynamic4.pc
+libdata/pkgconfig/omniORB4.pc
+libdata/pkgconfig/omnithread3.pc
+man/man1/catior.1.gz
+man/man1/convertior.1.gz
+man/man1/genior.1.gz
+man/man1/nameclt.1.gz
+man/man1/omnicpp.1.gz
+man/man1/omniidl.1.gz
+man/man8/omniMapper.8.gz
+man/man8/omniNames.8.gz
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README.FIRST.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.unix
+%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes.txt
+%%PORTDOCS%%%%DOCSDIR%%/omniNames.html
+%%PORTDOCS%%%%DOCSDIR%%/omniNames.pdf
+%%PORTDOCS%%%%DOCSDIR%%/omniORB.pdf
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/contents_motif.gif
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/index.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/next_motif.gif
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB.css
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB001.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB002.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB003.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB004.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB005.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB006.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB007.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB008.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB009.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB010.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB011.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB012.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB013.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB014.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB015.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/previous_motif.gif
+%%PORTDOCS%%%%DOCSDIR%%/omniidl.html
+%%PORTDOCS%%%%DOCSDIR%%/omniidl.pdf
+%%PORTDOCS%%%%DOCSDIR%%/omnithread.html
+%%PORTDOCS%%%%DOCSDIR%%/omnithread.pdf
+%%PORTDOCS%%%%DOCSDIR%%/tex/cover.tex
+%%PORTDOCS%%%%DOCSDIR%%/tex/ode.tex
+%%PORTDOCS%%%%DOCSDIR%%/tex/omniNames.tex
+%%PORTDOCS%%%%DOCSDIR%%/tex/omniORB.bib
+%%PORTDOCS%%%%DOCSDIR%%/tex/omniORB.tex
+%%PORTDOCS%%%%DOCSDIR%%/tex/omniidl.tex
+%%PORTDOCS%%%%DOCSDIR%%/tex/omnithread.tex
+%%PORTDOCS%%%%DOCSDIR%%/tex/utilities.tex
+%%PORTDOCS%%%%DOCSDIR%%/utilities.html
+%%PORTDOCS%%%%DOCSDIR%%/utilities.pdf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/omniORB.cfg
+%%DATADIR%%/idl/COS/CosCollection.idl
+%%DATADIR%%/idl/COS/CosCompoundLifeCycle.idl
+%%DATADIR%%/idl/COS/CosConcurrencyControl.idl
+%%DATADIR%%/idl/COS/CosContainment.idl
+%%DATADIR%%/idl/COS/CosEventChannelAdmin.idl
+%%DATADIR%%/idl/COS/CosEventComm.idl
+%%DATADIR%%/idl/COS/CosExternalization.idl
+%%DATADIR%%/idl/COS/CosExternalizationContainment.idl
+%%DATADIR%%/idl/COS/CosExternalizationReference.idl
+%%DATADIR%%/idl/COS/CosGraphs.idl
+%%DATADIR%%/idl/COS/CosLicensingManager.idl
+%%DATADIR%%/idl/COS/CosLifeCycle.idl
+%%DATADIR%%/idl/COS/CosLifeCycleContainment.idl
+%%DATADIR%%/idl/COS/CosLifeCycleReference.idl
+%%DATADIR%%/idl/COS/CosNaming.idl
+%%DATADIR%%/idl/COS/CosNotification.idl
+%%DATADIR%%/idl/COS/CosNotifyChannelAdmin.idl
+%%DATADIR%%/idl/COS/CosNotifyComm.idl
+%%DATADIR%%/idl/COS/CosNotifyFilter.idl
+%%DATADIR%%/idl/COS/CosObjectIdentity.idl
+%%DATADIR%%/idl/COS/CosPersistenceDDO.idl
+%%DATADIR%%/idl/COS/CosPersistenceDS_CLI.idl
+%%DATADIR%%/idl/COS/CosPersistencePDS.idl
+%%DATADIR%%/idl/COS/CosPersistencePDS_DA.idl
+%%DATADIR%%/idl/COS/CosPersistencePID.idl
+%%DATADIR%%/idl/COS/CosPersistencePO.idl
+%%DATADIR%%/idl/COS/CosPersistencePOM.idl
+%%DATADIR%%/idl/COS/CosPropertyService.idl
+%%DATADIR%%/idl/COS/CosQuery.idl
+%%DATADIR%%/idl/COS/CosQueryCollection.idl
+%%DATADIR%%/idl/COS/CosReference.idl
+%%DATADIR%%/idl/COS/CosRelationships.idl
+%%DATADIR%%/idl/COS/CosStream.idl
+%%DATADIR%%/idl/COS/CosTSPortability.idl
+%%DATADIR%%/idl/COS/CosTime.idl
+%%DATADIR%%/idl/COS/CosTimerEvent.idl
+%%DATADIR%%/idl/COS/CosTrading.idl
+%%DATADIR%%/idl/COS/CosTradingDynamic.idl
+%%DATADIR%%/idl/COS/CosTradingRepos.idl
+%%DATADIR%%/idl/COS/CosTransactions.idl
+%%DATADIR%%/idl/COS/CosTypedEventChannelAdmin.idl
+%%DATADIR%%/idl/COS/CosTypedEventComm.idl
+%%DATADIR%%/idl/COS/CosTypedNotifyChannelAdmin.idl
+%%DATADIR%%/idl/COS/CosTypedNotifyComm.idl
+%%DATADIR%%/idl/COS/DCE_CIOPSecurity.idl
+%%DATADIR%%/idl/COS/LifeCycleService.idl
+%%DATADIR%%/idl/COS/Lname-library.idl
+%%DATADIR%%/idl/COS/NRService.idl
+%%DATADIR%%/idl/COS/RDITestTypes.idl
+%%DATADIR%%/idl/COS/SECIOP.idl
+%%DATADIR%%/idl/COS/SSLIOP.idl
+%%DATADIR%%/idl/COS/Security.idl
+%%DATADIR%%/idl/COS/SecurityAdmin.idl
+%%DATADIR%%/idl/COS/SecurityLevel1.idl
+%%DATADIR%%/idl/COS/SecurityLevel2.idl
+%%DATADIR%%/idl/COS/SecurityReplaceable.idl
+%%DATADIR%%/idl/COS/TimeBase.idl
+%%DATADIR%%/idl/Naming.idl
+%%DATADIR%%/idl/bootstrap.idl
+%%DATADIR%%/idl/boxes.idl
+%%DATADIR%%/idl/compression.idl
+%%DATADIR%%/idl/corbaidl.idl
+%%DATADIR%%/idl/echo.idl
+%%DATADIR%%/idl/ir.idl
+%%DATADIR%%/idl/messaging.idl
+%%DATADIR%%/idl/orb.idl
+%%DATADIR%%/idl/poa.idl
+%%DATADIR%%/idl/poa_include.idl
+%%DATADIR%%/idl/ziop.idl
diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile
index b256f25e35df..354cc2852d26 100644
--- a/devel/omniORB/Makefile
+++ b/devel/omniORB/Makefile
@@ -11,6 +11,7 @@ COMMENT=	Robust high performance CORBA ORB for C++ and Python
 
 LICENSE=	GPLv2
 
+CONFLICTS=	omniORB-4.1.*
 PLIST_SUB+=	SONUM=${PORTVERSION:C/.*\.//}
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes