Index: devel/py-omniorb/Makefile
===================================================================
--- devel/py-omniorb/Makefile	(revision 370189)
+++ devel/py-omniorb/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	omniorb
-PORTVERSION=	3.7
+PORTVERSION=	4.2.0
 CATEGORIES=	devel python
 MASTER_SITES=	SF/${PORTNAME}/omniORBpy/omniORBpy-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,8 +13,6 @@
 
 LICENSE=	LGPL21
 
-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 omniORBpy;
@@ -25,7 +23,7 @@
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-PLIST_SUB=	SONUM=${PORTVERSION:C/.*\.//}
+PLIST_SUB=	SONUM=2
 
 CONFIGURE_WRKSRC=	${WRKSRC}/build
 BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
Index: devel/py-omniorb/distinfo
===================================================================
--- devel/py-omniorb/distinfo	(revision 370189)
+++ devel/py-omniorb/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (omniORBpy-3.7.tar.bz2) = 64ddd49581b4f5dde04b8ed80d81ae96fd7efb1f8f6c8075aaf56de9522c1136
-SIZE (omniORBpy-3.7.tar.bz2) = 610025
+SHA256 (omniORBpy-4.2.0.tar.bz2) = c82b3bafacbb93cfaace41765219155f2b24eb3781369bba0581feb1dc50fe5e
+SIZE (omniORBpy-4.2.0.tar.bz2) = 653795
Index: devel/py-omniorb/pkg-plist
===================================================================
--- devel/py-omniorb/pkg-plist	(revision 370189)
+++ devel/py-omniorb/pkg-plist	(working copy)
@@ -13,22 +13,27 @@
 %%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%%/_omniConnMgmtmodule.so.4
+%%PYTHON_SITELIBDIR%%/_omniConnMgmtmodule.so.4.%%SONUM%%
+%%PYTHON_SITELIBDIR%%/_omniZIOPmodule.so
+%%PYTHON_SITELIBDIR%%/_omniZIOPmodule.so.4
+%%PYTHON_SITELIBDIR%%/_omniZIOPmodule.so.4.%%SONUM%%
 %%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so
-%%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so.3
-%%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so.3.%%SONUM%%
+%%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so.4
+%%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so.4.%%SONUM%%
 %%PYTHON_SITELIBDIR%%/_omnipymodule.so
-%%PYTHON_SITELIBDIR%%/_omnipymodule.so.3
-%%PYTHON_SITELIBDIR%%/_omnipymodule.so.3.%%SONUM%%
+%%PYTHON_SITELIBDIR%%/_omnipymodule.so.4
+%%PYTHON_SITELIBDIR%%/_omnipymodule.so.4.%%SONUM%%
 %%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so
-%%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so.3
-%%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so.3.%%SONUM%%
+%%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so.4
+%%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so.4.%%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/Compression.py
+%%PYTHON_SITELIBDIR%%/omniORB/Compression.pyc
 %%PYTHON_SITELIBDIR%%/omniORB/COS/CosCollection/__init__.py
 %%PYTHON_SITELIBDIR%%/omniORB/COS/CosCollection/__init__.pyc
 %%PYTHON_SITELIBDIR%%/omniORB/COS/CosCollection__POA/__init__.py
@@ -296,8 +301,12 @@
 %%PYTHON_SITELIBDIR%%/omniORB/PortableServer__POA.pyc
 %%PYTHON_SITELIBDIR%%/omniORB/URI.py
 %%PYTHON_SITELIBDIR%%/omniORB/URI.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/ZIOP.py
+%%PYTHON_SITELIBDIR%%/omniORB/ZIOP.pyc
 %%PYTHON_SITELIBDIR%%/omniORB/__init__.py
 %%PYTHON_SITELIBDIR%%/omniORB/__init__.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/ami.py
+%%PYTHON_SITELIBDIR%%/omniORB/ami.pyc
 %%PYTHON_SITELIBDIR%%/omniORB/any.py
 %%PYTHON_SITELIBDIR%%/omniORB/any.pyc
 %%PYTHON_SITELIBDIR%%/omniORB/boxes_idl.py
@@ -304,6 +313,8 @@
 %%PYTHON_SITELIBDIR%%/omniORB/boxes_idl.pyc
 %%PYTHON_SITELIBDIR%%/omniORB/codesets.py
 %%PYTHON_SITELIBDIR%%/omniORB/codesets.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/compression_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/compression_idl.pyc
 %%PYTHON_SITELIBDIR%%/omniORB/corbaidl_idl.py
 %%PYTHON_SITELIBDIR%%/omniORB/corbaidl_idl.pyc
 %%PYTHON_SITELIBDIR%%/omniORB/interceptors.py
@@ -310,14 +321,25 @@
 %%PYTHON_SITELIBDIR%%/omniORB/interceptors.pyc
 %%PYTHON_SITELIBDIR%%/omniORB/ir_idl.py
 %%PYTHON_SITELIBDIR%%/omniORB/ir_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/messaging_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/messaging_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/omniPolicy.py
+%%PYTHON_SITELIBDIR%%/omniORB/omniPolicy.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/omniZIOP.py
+%%PYTHON_SITELIBDIR%%/omniORB/omniZIOP.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/pollable_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/pollable_idl.pyc
 %%PYTHON_SITELIBDIR%%/omniORB/sslTP.py
 %%PYTHON_SITELIBDIR%%/omniORB/sslTP.pyc
 %%PYTHON_SITELIBDIR%%/omniORB/tcInternal.py
 %%PYTHON_SITELIBDIR%%/omniORB/tcInternal.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/ziop_idl.py
+%%PYTHON_SITELIBDIR%%/omniORB/ziop_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniidl_be/__init__.py
 %%PYTHON_SITELIBDIR%%/omniidl_be/python.py
 %%PYTHON_SITELIBDIR%%/omniidl_be/python.pyc
 %%PORTDOCS%%%%DOCSDIR%%/html/contents_motif.gif