8 files changed, 507 insertions, 1 deletions

diff --git a/devel/Makefile b/devel/Makefile
index 7c64b1d1523a..d257839ecd3e 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -3818,6 +3818,7 @@
     SUBDIR += py-oletools
     SUBDIR += py-omnijson
     SUBDIR += py-omniorb
+    SUBDIR += py-omniorb-3
     SUBDIR += py-optik
     SUBDIR += py-orbit
     SUBDIR += py-ordereddict
diff --git a/devel/py-omniorb-3/Makefile b/devel/py-omniorb-3/Makefile
new file mode 100644
index 000000000000..eaf9d353e2ba
--- /dev/null
+++ b/devel/py-omniorb-3/Makefile
@@ -0,0 +1,67 @@
+# Created by: Johann Visagie <johann@egenetics.com>
+# $FreeBSD$
+
+PORTNAME=	omniorb
+PORTVERSION=	3.7
+CATEGORIES=	devel python
+MASTER_SITES=	SF/${PORTNAME}/omniORBpy/omniORBpy-${PORTVERSION}
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	3
+DISTNAME=	omniORBpy-${PORTVERSION}
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Python bindings for omniORB4, a CORBA 2.6 ORB
+
+LICENSE=	LGPL21
+
+LIB_DEPENDS=	libomniORB4.so.1:${PORTSDIR}/devel/omniORB-4.1
+# parts of omniORB4 source tree is required to build omniORBpy;
+# see also the "post-extract" target below.
+BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/devel/omniORB-4.1:patch
+
+CONFLICTS=	py${PYTHON_SUFFIX}-orbit-2* py${PYTHON_SUFFIX}-omniorb-4.2*
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
+PLIST_SUB=	SONUM=${PORTVERSION:C/.*\.//}
+
+CONFIGURE_WRKSRC=	${WRKSRC}/build
+BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
+INSTALL_WRKSRC=	${CONFIGURE_WRKSRC}
+OMNIORB_WRKSRC!=	cd ${.CURDIR}/../omniORB-4.1 && ${MAKE} -V WRKSRC
+
+USE_OPENSSL=	yes
+GNU_CONFIGURE=	yes
+MAKEFILE=	GNUmakefile
+USE_LDCONFIG=	yes
+USES=		gmake python tar:bzip2
+
+CONFIGURE_SCRIPT=	../configure
+CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD}
+CONFIGURE_ARGS=	--with-openssl=${OPENSSLBASE} --with-omniorb=${LOCALBASE}
+
+.include <bsd.port.options.mk>
+
+pre-configure:
+	${MKDIR} ${CONFIGURE_WRKSRC}
+	cd ${OMNIORB_WRKSRC} && ${FIND} idl | ${CPIO} --quiet -pdum ${WRKSRC}
+
+post-install:
+	${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/omniidl_be/__init__.py
+	cd ${STAGEDIR}${PYTHON_SITELIBDIR} && ${PYTHON_CMD} -c "import py_compile;py_compile.compile('CosNaming/__init__.py',None,'CosNaming/__init__.pyc',True)"
+	cd ${STAGEDIR}${PYTHON_SITELIBDIR} && ${PYTHON_CMD} -c "import py_compile;py_compile.compile('CosNaming__POA/__init__.py',None,'CosNaming__POA/__init__.pyc',True)"
+	cd ${STAGEDIR}${PYTHON_SITELIBDIR} && ${PYTHON_CMD} -c "import py_compile;py_compile.compile('omniidl_be/python.py',None,'omniidl_be/python.pyc',True)"
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/tex
+	${INSTALL_DATA} ${WRKSRC}/doc/omniORBpy.* ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/omniORBpy/* ${STAGEDIR}${DOCSDIR}/html
+	${INSTALL_DATA} ${WRKSRC}/doc/tex/* ${STAGEDIR}${DOCSDIR}/tex
+.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	cd ${WRKSRC}/examples && ${FIND} . \
+	  | ${CPIO} --quiet -pdum -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${EXAMPLESDIR}
+.endif
+
+.include <bsd.port.mk>
diff --git a/devel/py-omniorb-3/distinfo b/devel/py-omniorb-3/distinfo
new file mode 100644
index 000000000000..a55ccf9ca8b5
--- /dev/null
+++ b/devel/py-omniorb-3/distinfo
@@ -0,0 +1,2 @@
+SHA256 (omniORBpy-3.7.tar.bz2) = 64ddd49581b4f5dde04b8ed80d81ae96fd7efb1f8f6c8075aaf56de9522c1136
+SIZE (omniORBpy-3.7.tar.bz2) = 610025
diff --git a/devel/py-omniorb-3/files/patch-omniidl_be-dir.mk b/devel/py-omniorb-3/files/patch-omniidl_be-dir.mk
new file mode 100644
index 000000000000..11ff45e961fd
--- /dev/null
+++ b/devel/py-omniorb-3/files/patch-omniidl_be-dir.mk
@@ -0,0 +1,19 @@
+--- omniidl_be/dir.mk.orig	Wed Feb  8 23:42:52 2006
++++ omniidl_be/dir.mk	Wed Feb  8 23:43:03 2006
+@@ -13,8 +13,6 @@
+           for file in $^; do \
+             $(ExportFileToDir) \
+           done; \
+-          cd $(PYLIBDIR); \
+-	  $(PYTHON) -c "import compileall; compileall.compile_dir('.')"; \
+ 	 )
+ 
+ ifdef INSTALLTARGET
+@@ -23,7 +21,5 @@
+           for file in $^; do \
+             $(ExportFileToDir) \
+           done; \
+-          cd $(INSTALLPYLIBDIR); \
+-	  $(PYTHON) -c "import compileall; compileall.compile_dir('.')"; \
+ 	 )
+ endif
diff --git a/devel/py-omniorb-3/files/patch-python-dir.mk b/devel/py-omniorb-3/files/patch-python-dir.mk
new file mode 100644
index 000000000000..a5f55572c35b
--- /dev/null
+++ b/devel/py-omniorb-3/files/patch-python-dir.mk
@@ -0,0 +1,19 @@
+--- python/dir.mk.orig	Wed Feb  8 23:42:23 2006
++++ python/dir.mk	Wed Feb  8 23:42:44 2006
+@@ -24,7 +24,7 @@
+             $(ExportFileToDir) \
+           done; \
+           cd $(PYLIBDIR); \
+-	  $(PYTHON) -c "import compileall; compileall.compile_dir('.')"; \
++	  $(PYTHON) -c "import compileall; compileall.compile_dir('.',0)"; \
+ 	 )
+ 
+ ifdef INSTALLTARGET
+@@ -34,6 +34,6 @@
+             $(ExportFileToDir) \
+           done; \
+           cd $(INSTALLPYLIBDIR); \
+-	  $(PYTHON) -c "import compileall; compileall.compile_dir('.')"; \
++	  $(PYTHON) -c "import compileall; compileall.compile_dir('.',0)"; \
+ 	 )
+ endif
diff --git a/devel/py-omniorb-3/pkg-descr b/devel/py-omniorb-3/pkg-descr
new file mode 100644
index 000000000000..6caa159f218f
--- /dev/null
+++ b/devel/py-omniorb-3/pkg-descr
@@ -0,0 +1,8 @@
+omniORBpy is an object request broker (ORB) for Python which implements
+specification 2.6 of the Common Object Request Broker Architecture (CORBA).
+omniORBpy is implemented as a Python extension module (written in C++) to
+provide bindings for omniORB4, a high performance C++ ORB.
+
+This is the legacy version, based upon omniORB-4.1.
+
+WWW: http://omniorb.sourceforge.net
diff --git a/devel/py-omniorb-3/pkg-plist b/devel/py-omniorb-3/pkg-plist
new file mode 100644
index 000000000000..c62a11d49c4c
--- /dev/null
+++ b/devel/py-omniorb-3/pkg-plist
@@ -0,0 +1,390 @@
+include/omniORB4/pydistdate.hh
+include/omniORBpy.h
+%%PYTHON_SITELIBDIR%%/CORBA.py
+%%PYTHON_SITELIBDIR%%/CORBA.pyc
+%%PYTHON_SITELIBDIR%%/CosNaming/__init__.py
+%%PYTHON_SITELIBDIR%%/CosNaming/__init__.pyc
+%%PYTHON_SITELIBDIR%%/CosNaming__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/CosNaming__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/CosNaming_idl.py
+%%PYTHON_SITELIBDIR%%/CosNaming_idl.pyc
+%%PYTHON_SITELIBDIR%%/PortableServer.py
+%%PYTHON_SITELIBDIR%%/PortableServer.pyc
+%%PYTHON_SITELIBDIR%%/PortableServer__POA.py
+%%PYTHON_SITELIBDIR%%/PortableServer__POA.pyc
+%%PYTHON_SITELIBDIR%%/_omniConnMgmtmodule.so
+%%PYTHON_SITELIBDIR%%/_omniConnMgmtmodule.so.3
+%%PYTHON_SITELIBDIR%%/_omniConnMgmtmodule.so.3.%%SONUM%%
+%%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so
+%%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so.3
+%%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so.3.%%SONUM%%
+%%PYTHON_SITELIBDIR%%/_omnipymodule.so
+%%PYTHON_SITELIBDIR%%/_omnipymodule.so.3
+%%PYTHON_SITELIBDIR%%/_omnipymodule.so.3.%%SONUM%%
+%%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so
+%%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so.3
+%%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so.3.%%SONUM%%
+%%PYTHON_SITELIBDIR%%/omniORB.pth
+%%PYTHON_SITELIBDIR%%/omniORB/BiDirPolicy.py
+%%PYTHON_SITELIBDIR%%/omniORB/BiDirPolicy.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/CORBA.py
+%%PYTHON_SITELIBDIR%%/omniORB/CORBA.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosCollection/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosCollection/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosCollection__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosCollection__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosCollection_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosCollection_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosCompoundLifeCycle/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosCompoundLifeCycle/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosCompoundLifeCycle__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosCompoundLifeCycle__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosCompoundLifeCycle_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosCompoundLifeCycle_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosContainment/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosContainment/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosContainment__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosContainment__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosContainment_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosContainment_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosEventChannelAdmin/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosEventChannelAdmin/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosEventChannelAdmin__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosEventChannelAdmin__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosEventChannelAdmin_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosEventChannelAdmin_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosEventComm/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosEventComm/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosEventComm__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosEventComm__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosEventComm_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosEventComm_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosExternalization/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosExternalization/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosExternalizationContainment/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosExternalizationContainment/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosExternalizationContainment__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosExternalizationContainment__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosExternalizationContainment_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosExternalizationContainment_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosExternalizationReference/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosExternalizationReference/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosExternalizationReference__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosExternalizationReference__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosExternalizationReference_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosExternalizationReference_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosExternalization__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosExternalization__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosExternalization_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosExternalization_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosGraphs/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosGraphs/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosGraphs__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosGraphs__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosGraphs_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosGraphs_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosLifeCycle/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosLifeCycle/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosLifeCycleContainment/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosLifeCycleContainment/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosLifeCycleContainment__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosLifeCycleContainment__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosLifeCycleContainment_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosLifeCycleContainment_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosLifeCycleReference/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosLifeCycleReference/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosLifeCycleReference__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosLifeCycleReference__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosLifeCycleReference_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosLifeCycleReference_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosLifeCycle__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosLifeCycle__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosLifeCycle_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosLifeCycle_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosNaming/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosNaming/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosNaming__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosNaming__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosNaming_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosNaming_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosNotification/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosNotification/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosNotification__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosNotification__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosNotification_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosNotification_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosNotifyChannelAdmin/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosNotifyChannelAdmin/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosNotifyChannelAdmin__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosNotifyChannelAdmin__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosNotifyChannelAdmin_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosNotifyChannelAdmin_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosNotifyComm/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosNotifyComm/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosNotifyComm__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosNotifyComm__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosNotifyComm_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosNotifyComm_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosNotifyFilter/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosNotifyFilter/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosNotifyFilter__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosNotifyFilter__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosNotifyFilter_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosNotifyFilter_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosObjectIdentity/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosObjectIdentity/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosObjectIdentity__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosObjectIdentity__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosObjectIdentity_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosObjectIdentity_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistenceDDO/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistenceDDO/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistenceDDO__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistenceDDO__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistenceDDO_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistenceDDO_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistenceDS_CLI/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistenceDS_CLI/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistenceDS_CLI__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistenceDS_CLI__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistenceDS_CLI_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistenceDS_CLI_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistencePDS/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistencePDS/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistencePDS_DA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistencePDS_DA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistencePDS_DA__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistencePDS_DA__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistencePDS_DA_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistencePDS_DA_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistencePDS__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistencePDS__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistencePDS_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistencePDS_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistencePID/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistencePID/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistencePID__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistencePID__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistencePID_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistencePID_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistencePO/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistencePO/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistencePOM/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistencePOM/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistencePOM__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistencePOM__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistencePOM_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistencePOM_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistencePO__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistencePO__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistencePO_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPersistencePO_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPropertyService/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPropertyService/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPropertyService__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPropertyService__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPropertyService_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosPropertyService_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosQuery/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosQuery/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosQueryCollection/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosQueryCollection/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosQueryCollection__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosQueryCollection__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosQueryCollection_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosQueryCollection_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosQuery__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosQuery__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosQuery_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosQuery_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosReference/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosReference/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosReference__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosReference__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosReference_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosReference_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosRelationships/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosRelationships/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosRelationships__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosRelationships__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosRelationships_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosRelationships_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosStream/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosStream/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosStream__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosStream__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosStream_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosStream_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTime/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTime/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTime__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTime__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTime_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTime_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTimerEvent/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTimerEvent/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTimerEvent__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTimerEvent__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTimerEvent_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTimerEvent_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTrading/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTrading/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTradingDynamic/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTradingDynamic/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTradingDynamic__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTradingDynamic__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTradingDynamic_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTradingDynamic_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTradingRepos/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTradingRepos/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTradingRepos__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTradingRepos__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTradingRepos_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTradingRepos_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTrading__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTrading__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTrading_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTrading_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTypedEventChannelAdmin/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTypedEventChannelAdmin/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTypedEventChannelAdmin__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTypedEventChannelAdmin__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTypedEventChannelAdmin_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTypedEventChannelAdmin_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTypedEventComm/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTypedEventComm/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTypedEventComm__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTypedEventComm__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTypedEventComm_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTypedEventComm_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTypedNotifyChannelAdmin/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTypedNotifyChannelAdmin/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTypedNotifyChannelAdmin__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTypedNotifyChannelAdmin__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTypedNotifyChannelAdmin_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTypedNotifyChannelAdmin_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTypedNotifyComm/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTypedNotifyComm/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTypedNotifyComm__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTypedNotifyComm__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTypedNotifyComm_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/CosTypedNotifyComm_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/LifeCycleService/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/LifeCycleService/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/LifeCycleService__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/LifeCycleService__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/LifeCycleService_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/LifeCycleService_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/RDITestTypes/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/RDITestTypes/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/RDITestTypes__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/RDITestTypes__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/RDITestTypes_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/RDITestTypes_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/TimeBase/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/TimeBase/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/TimeBase__POA/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/TimeBase__POA/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/TimeBase_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/TimeBase_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/COS/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/COS/omniORB.pth
+%%PYTHON_SITELIBDIR%%/omniORB/PortableServer.py
+%%PYTHON_SITELIBDIR%%/omniORB/PortableServer.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/PortableServer__POA.py
+%%PYTHON_SITELIBDIR%%/omniORB/PortableServer__POA.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/URI.py
+%%PYTHON_SITELIBDIR%%/omniORB/URI.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/__init__.py
+%%PYTHON_SITELIBDIR%%/omniORB/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/any.py
+%%PYTHON_SITELIBDIR%%/omniORB/any.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/boxes_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/boxes_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/codesets.py
+%%PYTHON_SITELIBDIR%%/omniORB/codesets.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/corbaidl_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/corbaidl_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/interceptors.py
+%%PYTHON_SITELIBDIR%%/omniORB/interceptors.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/ir_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/ir_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/minorCodes.py
+%%PYTHON_SITELIBDIR%%/omniORB/minorCodes.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/omniConnectionMgmt.py
+%%PYTHON_SITELIBDIR%%/omniORB/omniConnectionMgmt.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/sslTP.py
+%%PYTHON_SITELIBDIR%%/omniORB/sslTP.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/tcInternal.py
+%%PYTHON_SITELIBDIR%%/omniORB/tcInternal.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/python.py
+%%PYTHON_SITELIBDIR%%/omniidl_be/python.pyc
+%%PORTDOCS%%%%DOCSDIR%%/html/contents_motif.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/next_motif.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/omniORBpy.css
+%%PORTDOCS%%%%DOCSDIR%%/html/omniORBpy.html
+%%PORTDOCS%%%%DOCSDIR%%/html/omniORBpy001.html
+%%PORTDOCS%%%%DOCSDIR%%/html/omniORBpy002.html
+%%PORTDOCS%%%%DOCSDIR%%/html/omniORBpy003.html
+%%PORTDOCS%%%%DOCSDIR%%/html/omniORBpy004.html
+%%PORTDOCS%%%%DOCSDIR%%/html/omniORBpy005.html
+%%PORTDOCS%%%%DOCSDIR%%/html/omniORBpy006.html
+%%PORTDOCS%%%%DOCSDIR%%/html/omniORBpy007.html
+%%PORTDOCS%%%%DOCSDIR%%/html/omniORBpy008.html
+%%PORTDOCS%%%%DOCSDIR%%/html/omniORBpy009.html
+%%PORTDOCS%%%%DOCSDIR%%/html/omniORBpy010.html
+%%PORTDOCS%%%%DOCSDIR%%/html/omniORBpy011.html
+%%PORTDOCS%%%%DOCSDIR%%/html/previous_motif.gif
+%%PORTDOCS%%%%DOCSDIR%%/omniORBpy.pdf
+%%PORTDOCS%%%%DOCSDIR%%/tex/omniORBpy.bib
+%%PORTDOCS%%%%DOCSDIR%%/tex/omniORBpy.tex
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/echo/echo.idl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/echo/echo_clt.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/echo/echo_srv.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/echo/example_echo.idl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/echo/example_echo_clt.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/echo/example_echo_coloc.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/echo/example_echo_nsclt.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/echo/example_echo_nssrv.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/echo/example_echo_srv.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/embed/GNUmakefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/embed/GNUmakefile.in
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/embed/dir.mk
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/embed/echo.idl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/embed/embed.cc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/embed/embed.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortune/fortune.idl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortune/fortune_server.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/poa/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/poa/echo.idl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/poa/mainthread.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/poa/servantactivator.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/poa/servantlocator.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/poa/singlethread.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/random/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/random/random.idl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/random/random_clt.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/PerfTest.idl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/TypeTest.idl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/pclient.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/pserver.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/tclient.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/tserver.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tictactoe/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tictactoe/gameClient.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tictactoe/gameServer.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tictactoe/tictactoe.idl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/valuetype/simple/client.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/valuetype/simple/server.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/valuetype/simple/value.idl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/valuetype/tests/client.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/valuetype/tests/server.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/valuetype/tests/value1.idl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/valuetype/tests/value2.idl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/weather/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/weather/gauge.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/weather/weather.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/weather/weatherInfo.idl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/weather/wserver.py
diff --git a/devel/py-omniorb/Makefile b/devel/py-omniorb/Makefile
index b484b2b0e077..1acc2e799ac3 100644
--- a/devel/py-omniorb/Makefile
+++ b/devel/py-omniorb/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	omniidl:${PORTSDIR}/devel/omniORB
 # see also the "post-extract" target below.
 BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/devel/omniORB:patch
 
-CONFLICTS=	py*-orbit-2*
+CONFLICTS=	py*-orbit-2* py${PYTHON_SUFFIX}-omniorb3-3*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES