9 files changed, 29 insertions, 39 deletions

diff --git a/devel/ace+tao/Makefile b/devel/ace+tao/Makefile
index 18fc7382e849..95543c6c0fad 100644
--- a/devel/ace+tao/Makefile
+++ b/devel/ace+tao/Makefile
@@ -23,7 +23,6 @@ TAO_VERSION=	1.4.2
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
 TESTS=		"@comment "
diff --git a/devel/mico/Makefile b/devel/mico/Makefile
index de5b04d835e1..78cc2048eb35 100644
--- a/devel/mico/Makefile
+++ b/devel/mico/Makefile
@@ -20,7 +20,6 @@ COMMENT=	Fully compliant implementation of CORBA2.4 with some CORBA3 features
 WRKSRC=			${WRKDIR}/${PORTNAME}
 INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
-USE_REINPLACE=		yes
 USE_GMAKE=		yes
 USE_AUTOTOOLS=	autoconf:259
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/devel/omniNotify/Makefile b/devel/omniNotify/Makefile
index 045cbba81b9f..f294c97080d5 100644
--- a/devel/omniNotify/Makefile
+++ b/devel/omniNotify/Makefile
@@ -31,7 +31,6 @@ GNU_CONFIGURE=	yes
 MAKEFILE=	GNUmakefile
 INSTALLS_SHLIB=	yes
 NO_FILTER_SHLIBS=	yes
-USE_REINPLACE=	yes
 
 # Don't compiled on != i386
 ONLY_FOR_ARCHS=	i386
diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile
index 810ba5f232f0..8dbb7e8a4fbe 100644
--- a/devel/omniORB/Makefile
+++ b/devel/omniORB/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	omniORB
-PORTVERSION=	4.0.6
+PORTVERSION=	4.0.7
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
@@ -17,7 +17,6 @@ COMMENT=	A robust high performance CORBA ORB for C++ and Python
 PLIST_SUB+=	SONUM=${PORTVERSION:C/.*\.//}
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_REINPLACE=	yes
 USE_PYTHON=	yes
 USE_OPENSSL=	yes
 USE_GNOME=	pkgconfig
diff --git a/devel/omniORB/distinfo b/devel/omniORB/distinfo
index fc765e72be91..3f3967e7fd83 100644
--- a/devel/omniORB/distinfo
+++ b/devel/omniORB/distinfo
@@ -1,3 +1,3 @@
-MD5 (omniORB-4.0.6.tar.gz) = 9fc17e2d91abef27f75728874fa09dd6
-SHA256 (omniORB-4.0.6.tar.gz) = af4ceea8c734b87059cf027d239375357daee7fd3f13fca3d81740f4eae3d371
-SIZE (omniORB-4.0.6.tar.gz) = 2795062
+MD5 (omniORB-4.0.7.tar.gz) = 9d478031be34232e988f3d5874396499
+SHA256 (omniORB-4.0.7.tar.gz) = e4c0875794a74ac627b7b74b6098e75c8413bd156856dc434a49c4c112a68af2
+SIZE (omniORB-4.0.7.tar.gz) = 2784040
diff --git a/devel/omniORB/pkg-plist b/devel/omniORB/pkg-plist
index d9d21ccb9b7e..8c6fbeb0c74b 100644
--- a/devel/omniORB/pkg-plist
+++ b/devel/omniORB/pkg-plist
@@ -148,12 +148,24 @@ 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/stringtypes.h
 include/omniORB4/tcDescriptor.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/wstringtypes.h
 include/omniconfig.h
@@ -190,7 +202,7 @@ lib/libomnisslTP.so.4
 lib/libomnisslTP.so.4.0
 lib/libomnithread.so
 lib/libomnithread.so.3
-lib/libomnithread.so.3.1
+lib/libomnithread.so.3.2
 libdata/pkgconfig/omniCOS4.pc
 libdata/pkgconfig/omniCOSDynamic4.pc
 libdata/pkgconfig/omniDynamic4.pc
@@ -200,33 +212,20 @@ libdata/pkgconfig/omnithread3.pc
 %%PYTHON_SITELIBDIR%%/_omniidlmodule.so.1
 %%PYTHON_SITELIBDIR%%/_omniidlmodule.so.1.0
 %%PYTHON_SITELIBDIR%%/omniidl/__init__.py
-%%PYTHON_SITELIBDIR%%/omniidl/__init__.pyc
 %%PYTHON_SITELIBDIR%%/omniidl/idlast.py
-%%PYTHON_SITELIBDIR%%/omniidl/idlast.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
+@unexec rm -f %B/*.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
@@ -256,17 +255,13 @@ libdata/pkgconfig/omnithread3.pc
 %%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
+@unexec rm -f %B/*.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
@@ -285,12 +280,11 @@ libdata/pkgconfig/omnithread3.pc
 %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/types.pyc
 %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/util.py
 %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/util.pyc
+@unexec rm -f %B/*.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
+@unexec rm -f %B/*.pyc
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README.FIRST.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.unix
diff --git a/devel/py-omniorb/Makefile b/devel/py-omniorb/Makefile
index 79bddaa59a83..1a729220faaa 100644
--- a/devel/py-omniorb/Makefile
+++ b/devel/py-omniorb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	omniorb
-PORTVERSION=	2.6
+PORTVERSION=	2.7
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
@@ -37,7 +37,6 @@ USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 MAKEFILE=	GNUmakefile
 INSTALLS_SHLIB=	yes
-USE_REINPLACE=	yes
 
 CONFIGURE_SCRIPT=	../configure
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/devel/py-omniorb/distinfo b/devel/py-omniorb/distinfo
index 5c673031745b..17ddd3467c2e 100644
--- a/devel/py-omniorb/distinfo
+++ b/devel/py-omniorb/distinfo
@@ -1,3 +1,3 @@
-MD5 (omniORBpy-2.6.tar.gz) = 1dda91c3b0c1cc422a2c7096c719295f
-SHA256 (omniORBpy-2.6.tar.gz) = 12a784978bc7b0d8308d68f0d0ae92a9a0cb1aff509d02d581b4acd22363e1c3
-SIZE (omniORBpy-2.6.tar.gz) = 641486
+MD5 (omniORBpy-2.7.tar.gz) = 930acc2a60298b20f2ff79365745bc5b
+SHA256 (omniORBpy-2.7.tar.gz) = 27b6793c4dd0df8ac65e6f020358ceb681904efc7bd886d6816776ba4f4bc0ae
+SIZE (omniORBpy-2.7.tar.gz) = 642784
diff --git a/devel/py-omniorb/pkg-plist b/devel/py-omniorb/pkg-plist
index 6eaad7c38fcb..9e1b7dda0280 100644
--- a/devel/py-omniorb/pkg-plist
+++ b/devel/py-omniorb/pkg-plist
@@ -16,13 +16,13 @@ include/omniORBpy.h
 %%PYTHON_SITELIBDIR%%/__init__.pyc
 %%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so
 %%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so.2
-%%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so.2.0
+%%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so.2.%%SONUM%%
 %%PYTHON_SITELIBDIR%%/_omnipymodule.so
 %%PYTHON_SITELIBDIR%%/_omnipymodule.so.2
 %%PYTHON_SITELIBDIR%%/_omnipymodule.so.2.%%SONUM%%
 %%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so
 %%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so.2
-%%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so.2.0
+%%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so.2.%%SONUM%%
 %%PYTHON_SITELIBDIR%%/omniORB.pth
 %%PYTHON_SITELIBDIR%%/omniORB/BiDirPolicy.py
 %%PYTHON_SITELIBDIR%%/omniORB/BiDirPolicy.pyc
@@ -303,6 +303,8 @@ include/omniORBpy.h
 %%PYTHON_SITELIBDIR%%/omniORB/codesets.pyc
 %%PYTHON_SITELIBDIR%%/omniORB/interceptors.py
 %%PYTHON_SITELIBDIR%%/omniORB/interceptors.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/minorCodes.py
+%%PYTHON_SITELIBDIR%%/omniORB/minorCodes.pyc
 %%PYTHON_SITELIBDIR%%/omniORB/ir_idl.py
 %%PYTHON_SITELIBDIR%%/omniORB/ir_idl.pyc
 %%PYTHON_SITELIBDIR%%/omniORB/sslTP.py
@@ -469,6 +471,5 @@ include/omniORBpy.h
 @dirrm %%PYTHON_SITELIBDIR%%/omniORB/COS/CosCollection
 @dirrm %%PYTHON_SITELIBDIR%%/omniORB/COS
 @dirrm %%PYTHON_SITELIBDIR%%/omniORB
-@dirrm %%PYTHON_SITELIBDIR%%/omniidl_be
 @dirrm %%PYTHON_SITELIBDIR%%/CosNaming__POA
 @dirrm %%PYTHON_SITELIBDIR%%/CosNaming