git: 2019b2cdef2f - main - devel/py-omniorb: Update version 4.2.4=>4.3.0

From: Muhammad Moinur Rahman <bofh_at_FreeBSD.org>
Date: Tue, 18 Jan 2022 20:31:16 UTC
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2019b2cdef2fd96d558584409debad969c8c1805

commit 2019b2cdef2fd96d558584409debad969c8c1805
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2022-01-18 20:30:05 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2022-01-18 20:31:08 +0000

    devel/py-omniorb: Update version 4.2.4=>4.3.0
    
    Relnotes:
    https://sourceforge.net/projects/omniorb/files/omniORBpy/omniORBpy-4.3.0/
---
 devel/py-omniorb/Makefile                          | 35 +++++++++++-----------
 devel/py-omniorb/distinfo                          |  6 ++--
 .../{patch-python-dir.mk => patch-python3_dir.mk}  |  4 +--
 ..._be_dir.mk => patch-python3_omniidl__be_dir.mk} |  4 +--
 devel/py-omniorb/pkg-plist                         | 23 ++++++++++----
 5 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/devel/py-omniorb/Makefile b/devel/py-omniorb/Makefile
index 994a3e46b038..9f84008e0e69 100644
--- a/devel/py-omniorb/Makefile
+++ b/devel/py-omniorb/Makefile
@@ -1,7 +1,7 @@
 # Created by: Johann Visagie <johann@egenetics.com>
 
 PORTNAME=	omniorb
-DISTVERSION=	4.2.4
+DISTVERSION=	4.3.0
 CATEGORIES=	devel python
 MASTER_SITES=	SF/${PORTNAME}/omniORBpy/omniORBpy-${DISTVERSION:S/-2//}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,36 +12,34 @@ COMMENT=	Python bindings for omniORB4, a CORBA 2.6 ORB
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libomniORB4.so:devel/omniORB
-RUN_DEPENDS=	omniidl:devel/omniORB
 # parts of omniORB4 source tree is required to build omniORBpy;
 # see also the "post-extract" target below.
 BUILD_DEPENDS=	${NONEXISTENT}:devel/omniORB:patch
+LIB_DEPENDS=	libomniORB4.so:devel/omniORB
+RUN_DEPENDS=	omniidl:devel/omniORB
 
 USES=		gmake python shebangfix ssl tar:bzip2
 USE_PYTHON=	py3kplist
 
-CONFLICTS=	py*-orbit-2* ${PYTHON_PKGNAMEPREFIX}omniorb3-3*
+SHEBANG_FILES=	examples/ami/*.py examples/echo/*.py examples/embed/*.py \
+		examples/fortune/*.py examples/poa/*.py examples/tests/*.py \
+		examples/valuetype/simple/*.py examples/valuetype/tests/*.py
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=		--with-omniorb=${LOCALBASE} \
+			--with-openssl=${OPENSSLBASE}
+CONFIGURE_ENV+=		PYTHON=${PYTHON_CMD}
+CONFIGURE_OUTSOURCE=	yes
 
-PLIST_SUB=	SONUM=2
+MAKEFILE=	GNUmakefile
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-2//}
-OMNIORB_WRKSRC=	cd ${.CURDIR}/../omniORB && ${MAKE} -V WRKSRC
 
-GNU_CONFIGURE=	yes
-CONFIGURE_OUTSOURCE=	yes
-MAKEFILE=	GNUmakefile
-SHEBANG_FILES=	examples/tests/*.py examples/poa/*.py \
-		examples/fortune/*.py examples/embed/*.py \
-		examples/valuetype/tests/*.py \
-		examples/valuetype/simple/*.py \
-		examples/ami/*.py \
-		examples/echo/*.py
+PLIST_SUB=	SONUM=3
 
-CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD}
-CONFIGURE_ARGS=	--with-openssl=${OPENSSLBASE} --with-omniorb=${LOCALBASE}
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
+OMNIORB_WRKSRC=	cd ${.CURDIR}/../omniORB && ${MAKE} -V WRKSRC
 
 pre-configure:
 	@cd $$(${OMNIORB_WRKSRC}) && ${FIND} idl | ${CPIO} --quiet -pdum ${WRKSRC}
@@ -52,6 +50,7 @@ post-install:
 	cd ${STAGEDIR}${PYTHON_SITELIBDIR} && ${PYTHON_CMD} -c "import py_compile;py_compile.compile('omniidl_be/python.py',None,'omniidl_be/python.pyc',True)"
 	@${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/omniidl_be/__init__.py* \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/omniidl_be/__pycache__/__init__.*
+	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/*.so
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
diff --git a/devel/py-omniorb/distinfo b/devel/py-omniorb/distinfo
index 596f0a5f29db..99f375598054 100644
--- a/devel/py-omniorb/distinfo
+++ b/devel/py-omniorb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1586371742
-SHA256 (omniORBpy-4.2.4.tar.bz2) = dae8d867559cc934002b756bc01ad7fabbc63f19c2d52f755369989a7a1d27b6
-SIZE (omniORBpy-4.2.4.tar.bz2) = 663326
+TIMESTAMP = 1642535024
+SHA256 (omniORBpy-4.3.0.tar.bz2) = fffcfdfc34fd6e2fcc45d803d7d5db5bd4d188a747ff9f82b3684a753e001b4d
+SIZE (omniORBpy-4.3.0.tar.bz2) = 729969
diff --git a/devel/py-omniorb/files/patch-python-dir.mk b/devel/py-omniorb/files/patch-python3_dir.mk
similarity index 89%
rename from devel/py-omniorb/files/patch-python-dir.mk
rename to devel/py-omniorb/files/patch-python3_dir.mk
index b4b6e9939c3a..2c528348b318 100644
--- a/devel/py-omniorb/files/patch-python-dir.mk
+++ b/devel/py-omniorb/files/patch-python3_dir.mk
@@ -1,5 +1,5 @@
---- python/dir.mk.orig	2015-06-26 10:32:49 UTC
-+++ python/dir.mk
+--- python3/dir.mk.orig	2022-01-18 19:50:00 UTC
++++ python3/dir.mk
 @@ -24,7 +24,7 @@ export:: $(FILES)
              $(ExportFileToDir) \
            done; \
diff --git a/devel/py-omniorb/files/patch-python_omniidl__be_dir.mk b/devel/py-omniorb/files/patch-python3_omniidl__be_dir.mk
similarity index 84%
rename from devel/py-omniorb/files/patch-python_omniidl__be_dir.mk
rename to devel/py-omniorb/files/patch-python3_omniidl__be_dir.mk
index f92d83389e7f..3fc0a96018a3 100644
--- a/devel/py-omniorb/files/patch-python_omniidl__be_dir.mk
+++ b/devel/py-omniorb/files/patch-python3_omniidl__be_dir.mk
@@ -1,5 +1,5 @@
---- python/omniidl_be/dir.mk.orig	2003-03-23 21:51:59 UTC
-+++ python/omniidl_be/dir.mk
+--- python3/omniidl_be/dir.mk.orig	2022-01-18 19:52:54 UTC
++++ python3/omniidl_be/dir.mk
 @@ -13,8 +13,6 @@ export:: $(FILES)
            for file in $^; do \
              $(ExportFileToDir) \
diff --git a/devel/py-omniorb/pkg-plist b/devel/py-omniorb/pkg-plist
index 81a5327b2105..325d301999d2 100644
--- a/devel/py-omniorb/pkg-plist
+++ b/devel/py-omniorb/pkg-plist
@@ -17,38 +17,48 @@ include/omniORBpy.h
 %%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omniConnMgmtmodule.so.4.%%SONUM%%
 %%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniConnMgmt%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniConnMgmt%%PYTHON_EXT_SUFFIX%%.so.4
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniConnMgmt%%PYTHON_EXT_SUFFIX%%.so.4.2
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniConnMgmt%%PYTHON_EXT_SUFFIX%%.so.4.%%SONUM%%
+%%PYTHON_SITELIBDIR%%/_omnihttpCrypto%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON_SITELIBDIR%%/_omnihttpCrypto%%PYTHON_EXT_SUFFIX%%.so.4
+%%PYTHON_SITELIBDIR%%/_omnihttpCrypto%%PYTHON_EXT_SUFFIX%%.so.4.%%SONUM%%
+%%PYTHON_SITELIBDIR%%/_omnihttpTP%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON_SITELIBDIR%%/_omnihttpTP%%PYTHON_EXT_SUFFIX%%.so.4
+%%PYTHON_SITELIBDIR%%/_omnihttpTP%%PYTHON_EXT_SUFFIX%%.so.4.%%SONUM%%
 %%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omniZIOPmodule.so
 %%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omniZIOPmodule.so.4
 %%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omniZIOPmodule.so.4.%%SONUM%%
 %%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniZIOP%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniZIOP%%PYTHON_EXT_SUFFIX%%.so.4
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniZIOP%%PYTHON_EXT_SUFFIX%%.so.4.2
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniZIOP%%PYTHON_EXT_SUFFIX%%.so.4.%%SONUM%%
 %%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so
 %%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so.4
 %%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so.4.%%SONUM%%
 %%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omnicodesets%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omnicodesets%%PYTHON_EXT_SUFFIX%%.so.4
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omnicodesets%%PYTHON_EXT_SUFFIX%%.so.4.2
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omnicodesets%%PYTHON_EXT_SUFFIX%%.so.4.%%SONUM%%
 %%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omnipymodule.so
 %%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omnipymodule.so.4
 %%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omnipymodule.so.4.%%SONUM%%
 %%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omnipy%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omnipy%%PYTHON_EXT_SUFFIX%%.so.4
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omnipy%%PYTHON_EXT_SUFFIX%%.so.4.2
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omnipy%%PYTHON_EXT_SUFFIX%%.so.4.%%SONUM%%
 %%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so
 %%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so.4
 %%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so.4.%%SONUM%%
 %%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omnisslTP%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omnisslTP%%PYTHON_EXT_SUFFIX%%.so.4
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omnisslTP%%PYTHON_EXT_SUFFIX%%.so.4.2
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omnisslTP%%PYTHON_EXT_SUFFIX%%.so.4.%%SONUM%%
 %%PYTHON_SITELIBDIR%%/omniORB.pth
+%%PYTHON_SITELIBDIR%%/omniORB/__pycache__/ConnectionInfo%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/__pycache__/httpCrypto%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/__pycache__/httpTP%%PYTHON_EXT_SUFFIX%%.pyc
 %%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/ConnectionInfo.py
 %%PYTHON_SITELIBDIR%%/omniORB/COS/CosCollection/__init__.py
 %%PYTHON_SITELIBDIR%%/omniORB/COS/CosCollection/__init__.pyc
 %%PYTHON_SITELIBDIR%%/omniORB/COS/CosCollection__POA/__init__.py
@@ -332,6 +342,8 @@ include/omniORBpy.h
 %%PYTHON_SITELIBDIR%%/omniORB/compression_idl.pyc
 %%PYTHON_SITELIBDIR%%/omniORB/corbaidl_idl.py
 %%PYTHON_SITELIBDIR%%/omniORB/corbaidl_idl.pyc
+%%PYTHON_SITELIBDIR%%/omniORB/httpCrypto.py
+%%PYTHON_SITELIBDIR%%/omniORB/httpTP.py
 %%PYTHON_SITELIBDIR%%/omniORB/interceptors.py
 %%PYTHON_SITELIBDIR%%/omniORB/interceptors.pyc
 %%PYTHON_SITELIBDIR%%/omniORB/ir_idl.py
@@ -419,5 +431,6 @@ include/omniORBpy.h
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/valuetype/tests/server.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/valuetype/tests/value1.idl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/valuetype/tests/value2.idl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ziop/example_echo.idl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ziop/ziop_clt.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ziop/ziop_srv.py