Date: Tue, 18 Jan 2022 20:31:15 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 09ad94e26a48 - main - devel/omniORB: Update version 4.2.4=>4.3.0 Message-ID: <202201182031.20IKVFJh077297@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=09ad94e26a483f2ddecac55d804b75e1a35fb265 commit 09ad94e26a483f2ddecac55d804b75e1a35fb265 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2022-01-18 19:41:19 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2022-01-18 20:31:08 +0000 devel/omniORB: Update version 4.2.4=>4.3.0 Relnotes: https://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.3.0/ --- devel/omniORB/Makefile | 60 ++++++++++++++-------- devel/omniORB/distinfo | 6 +-- devel/omniORB/files/patch-configure | 4 +- .../files/patch-src_appl_utils_catior_catior.cc | 4 +- .../patch-src_appl_utils_convertior_convertior.cc | 4 +- devel/omniORB/pkg-plist | 59 ++++++++++++--------- 6 files changed, 82 insertions(+), 55 deletions(-) diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile index ecc16a8fab5f..2e111d33e7ff 100644 --- a/devel/omniORB/Makefile +++ b/devel/omniORB/Makefile @@ -1,7 +1,7 @@ # Created by: ejc@bazzle.com PORTNAME= omniORB -DISTVERSION= 4.2.4 +DISTVERSION= ${ABI_VER}.${ABI_MAJOR_VER}.${ABI_MINOR_VER} CATEGORIES= devel MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME}/${PORTNAME}-${DISTVERSION:S/-2//} @@ -10,30 +10,37 @@ COMMENT= Robust high performance CORBA ORB for C++ and Python LICENSE= GPLv2 +USES= compiler:gcc-c++11-lib gmake pkgconfig python shebangfix ssl \ + tar:bzip2 BROKEN_SSL= openssl BROKEN_SSL_REASON_openssl= member access into incomplete type 'DH' (aka 'dh_st') +USE_LDCONFIG= yes +USE_PYTHON= py3kplist -USES= compiler:c++11-lang gmake pkgconfig python tar:bzip2 \ - shebangfix ssl +SHEBANG_FILES= src/tool/omniidl/python2/scripts/omniidlrun.py \ + src/tool/omniidl/python3/scripts/omniidlrun.py -CONFLICTS= omniORB41-4.1.* -SONUM= 4 -PLIST_SUB+= SONUM=${SONUM} GNU_CONFIGURE= yes -USE_LDCONFIG= yes -USE_PYTHON= py3kplist -MAKEFILE= GNUmakefile -CONFIGURE_ENV+= PYTHON=${PYTHON_CMD} -CONFIGURE_ARGS= --datadir=${DATADIR} --with-openssl=${OPENSSLBASE} \ +CONFIGURE_ARGS= --datadir=${DATADIR} \ + --with-omniNames-logdir=/var/log \ --with-omniORB-config=${PREFIX}/etc/omniORB.cfg \ - --with-omniNames-logdir=/var/log -OPTIONS_DEFINE= DOCS STATIC + --with-openssl=${OPENSSLBASE} +CONFIGURE_ENV+= PYTHON=${PYTHON_CMD} + +MAKEFILE= GNUmakefile + +WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:S/-2//} + +ABI_VER= 4 +ABI_MAJOR_VER= 3 +ABI_MINOR_VER= 0 +PLIST_SUB+= ABI_MAJOR_VER=${ABI_MAJOR_VER} \ + ABI_MINOR_VER=${ABI_MINOR_VER} \ + ABI_VER=${ABI_VER} +OPTIONS_DEFINE= DOCS STATIC OPTIONS_DEFAULT= STATIC -OPTIONS_SUB= yes +OPTIONS_SUB= yes STATIC_CONFIGURE_OFF= --disable-static -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:S/-2//} -SHEBANG_FILES= src/tool/omniidl/python/scripts/omniidlrun.py \ - src/tool/omniidl/python3/scripts/omniidlrun.py post-patch: @${REINPLACE_CMD} -e 's#-O2#${CFLAGS}#g' ${WRKSRC}/mk/beforeauto.mk.in @@ -46,13 +53,22 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/sample.cfg ${STAGEDIR}${PREFIX}/etc/omniORB.cfg.sample @cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} *.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 @cd ${WRKSRC}/man/man8 && ${INSTALL_MAN} *.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 -.for i in catior convertior omniMapper omniNames omnicpp nameclt omkdepend genior +.for i in catior convertior omniMapper omniNames omnicpp nameclt omkdepend \ + genior @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i} .endfor -.for i in libomniDynamic4.so.2.${SONUM} libomnisslTP4.so.2.${SONUM} libCOS4.so.2.${SONUM} \ - libomniCodeSets4.so.2.${SONUM} libomniZIOPDynamic4.so.2.${SONUM} libomniZIOP4.so.2.${SONUM} \ - libomniConnectionMgmt4.so.2.${SONUM} libomniORB4.so.2.${SONUM} libCOSDynamic4.so.2.${SONUM} \ - libomnithread.so.4.1 +.for i in libomniConnectionMgmt4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} \ + libomniORB4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} \ + libCOSDynamic4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} \ + libomnihttpTP4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} \ + libomnihttpCrypto4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} \ + libomnisslTP4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} \ + libomniDynamic4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} \ + libCOS4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} \ + libomniCodeSets4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} \ + libomniZIOPDynamic4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} \ + libomnithread.so.${ABI_VER}.${ABI_MAJOR_VER} \ + libomniZIOP4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${i} .endfor @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/*.so diff --git a/devel/omniORB/distinfo b/devel/omniORB/distinfo index 735ba7b3aa2a..87760400d93b 100644 --- a/devel/omniORB/distinfo +++ b/devel/omniORB/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1586242745 -SHA256 (omniORB-4.2.4.tar.bz2) = 28c01cd0df76c1e81524ca369dc9e6e75f57dc70f30688c99c67926e4bdc7a6f -SIZE (omniORB-4.2.4.tar.bz2) = 2713397 +TIMESTAMP = 1642523909 +SHA256 (omniORB-4.3.0.tar.bz2) = 976045a2341f4e9a85068b21f4bd928993292933eeecefea372db09e0219eadd +SIZE (omniORB-4.3.0.tar.bz2) = 2762061 diff --git a/devel/omniORB/files/patch-configure b/devel/omniORB/files/patch-configure index c2c8adb5f70d..08fd2b8ae603 100644 --- a/devel/omniORB/files/patch-configure +++ b/devel/omniORB/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2020-04-04 14:09:52 UTC +--- configure.orig 2021-04-11 12:58:05 UTC +++ configure -@@ -7574,12 +7574,19 @@ case "$host" in +@@ -7670,12 +7670,19 @@ case "$host" in *-*-irix*) plat_name="IRIX"; plat_def="__irix__"; os_v="6";; *-*-aix*) plat_name="AIX"; plat_def="__aix__"; os_v="4";; *-*-darwin*) plat_name="Darwin"; plat_def="__darwin__"; os_v="1";; diff --git a/devel/omniORB/files/patch-src_appl_utils_catior_catior.cc b/devel/omniORB/files/patch-src_appl_utils_catior_catior.cc index 1962871c1277..ffac6340e9ae 100644 --- a/devel/omniORB/files/patch-src_appl_utils_catior_catior.cc +++ b/devel/omniORB/files/patch-src_appl_utils_catior_catior.cc @@ -1,6 +1,6 @@ ---- src/appl/utils/catior/catior.cc.orig 2017-02-20 22:45:59 UTC +--- src/appl/utils/catior/catior.cc.orig 2021-04-11 12:58:05 UTC +++ src/appl/utils/catior/catior.cc -@@ -53,6 +53,12 @@ +@@ -48,6 +48,12 @@ using namespace std; // macro called minor. #undef minor diff --git a/devel/omniORB/files/patch-src_appl_utils_convertior_convertior.cc b/devel/omniORB/files/patch-src_appl_utils_convertior_convertior.cc index 00a91d3afc03..5bd4439aae34 100644 --- a/devel/omniORB/files/patch-src_appl_utils_convertior_convertior.cc +++ b/devel/omniORB/files/patch-src_appl_utils_convertior_convertior.cc @@ -1,6 +1,6 @@ ---- src/appl/utils/convertior/convertior.cc.orig 2017-02-20 22:45:59 UTC +--- src/appl/utils/convertior/convertior.cc.orig 2020-09-21 21:47:46 UTC +++ src/appl/utils/convertior/convertior.cc -@@ -42,6 +42,12 @@ +@@ -38,6 +38,12 @@ using namespace std; // macro called minor. #undef minor diff --git a/devel/omniORB/pkg-plist b/devel/omniORB/pkg-plist index 7c7bd438a2e3..42878be730ef 100644 --- a/devel/omniORB/pkg-plist +++ b/devel/omniORB/pkg-plist @@ -74,6 +74,7 @@ include/omniORB4/callHandle.h include/omniORB4/cdrStream.h include/omniORB4/codeSets.h include/omniORB4/compression.hh +include/omniORB4/connectionInfo.h include/omniORB4/corba_operators.h include/omniORB4/corbaidl_defs.hh include/omniORB4/corbaidl_operators.hh @@ -83,6 +84,8 @@ include/omniORB4/dynAny.h include/omniORB4/finalCleanup.h include/omniORB4/fixed.h include/omniORB4/giopEndpoint.h +include/omniORB4/httpContext.h +include/omniORB4/httpCrypto.h include/omniORB4/internal/GIOP_C.h include/omniORB4/internal/GIOP_S.h include/omniORB4/internal/SocketCollection.h @@ -216,37 +219,45 @@ include/omnithread/pthread_nt.h %%STATIC%%lib/libomnisslTP4.a %%STATIC%%lib/libomnithread.a lib/libCOS4.so -lib/libCOS4.so.2 -lib/libCOS4.so.2.%%SONUM%% +lib/libCOS4.so.%%ABI_MAJOR_VER%% +lib/libCOS4.so.%%ABI_MAJOR_VER%%.%%ABI_MINOR_VER%% lib/libCOSDynamic4.so -lib/libCOSDynamic4.so.2 -lib/libCOSDynamic4.so.2.%%SONUM%% +lib/libCOSDynamic4.so.%%ABI_MAJOR_VER%% +lib/libCOSDynamic4.so.%%ABI_MAJOR_VER%%.%%ABI_MINOR_VER%% lib/libomniCodeSets4.so -lib/libomniCodeSets4.so.2 -lib/libomniCodeSets4.so.2.%%SONUM%% +lib/libomniCodeSets4.so.%%ABI_MAJOR_VER%% +lib/libomniCodeSets4.so.%%ABI_MAJOR_VER%%.%%ABI_MINOR_VER%% lib/libomniConnectionMgmt4.so -lib/libomniConnectionMgmt4.so.2 -lib/libomniConnectionMgmt4.so.2.%%SONUM%% +lib/libomniConnectionMgmt4.so.%%ABI_MAJOR_VER%% +lib/libomniConnectionMgmt4.so.%%ABI_MAJOR_VER%%.%%ABI_MINOR_VER%% lib/libomniDynamic4.so -lib/libomniDynamic4.so.2 -lib/libomniDynamic4.so.2.%%SONUM%% +lib/libomniDynamic4.so.%%ABI_MAJOR_VER%% +lib/libomniDynamic4.so.%%ABI_MAJOR_VER%%.%%ABI_MINOR_VER%% lib/libomniORB4.so -lib/libomniORB4.so.2 -lib/libomniORB4.so.2.%%SONUM%% +lib/libomniORB4.so.%%ABI_MAJOR_VER%% +lib/libomniORB4.so.%%ABI_MAJOR_VER%%.%%ABI_MINOR_VER%% lib/libomniZIOP4.a lib/libomniZIOP4.so -lib/libomniZIOP4.so.2 -lib/libomniZIOP4.so.2.%%SONUM%% +lib/libomniZIOP4.so.%%ABI_MAJOR_VER%% +lib/libomniZIOP4.so.%%ABI_MAJOR_VER%%.%%ABI_MINOR_VER%% lib/libomniZIOPDynamic4.a lib/libomniZIOPDynamic4.so -lib/libomniZIOPDynamic4.so.2 -lib/libomniZIOPDynamic4.so.2.%%SONUM%% +lib/libomniZIOPDynamic4.so.%%ABI_MAJOR_VER%% +lib/libomniZIOPDynamic4.so.%%ABI_MAJOR_VER%%.%%ABI_MINOR_VER%% +lib/libomnihttpCrypto4.a +lib/libomnihttpCrypto4.so +lib/libomnihttpCrypto4.so.%%ABI_MAJOR_VER%% +lib/libomnihttpCrypto4.so.%%ABI_MAJOR_VER%%.%%ABI_MINOR_VER%% +lib/libomnihttpTP4.a +lib/libomnihttpTP4.so +lib/libomnihttpTP4.so.%%ABI_MAJOR_VER%% +lib/libomnihttpTP4.so.%%ABI_MAJOR_VER%%.%%ABI_MINOR_VER%% lib/libomnisslTP4.so -lib/libomnisslTP4.so.2 -lib/libomnisslTP4.so.2.%%SONUM%% +lib/libomnisslTP4.so.%%ABI_MAJOR_VER%% +lib/libomnisslTP4.so.%%ABI_MAJOR_VER%%.%%ABI_MINOR_VER%% lib/libomnithread.so -lib/libomnithread.so.4 -lib/libomnithread.so.4.1 +lib/libomnithread.so.%%ABI_VER%% +lib/libomnithread.so.%%ABI_VER%%.%%ABI_MAJOR_VER%% libdata/pkgconfig/omniCOS4.pc libdata/pkgconfig/omniCOSDynamic4.pc libdata/pkgconfig/omniConnectionMgmt4.pc @@ -264,11 +275,11 @@ man/man8/omniNames.8.gz man/man1/omnicpp.1.gz man/man1/omniidl.1.gz %%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omniidlmodule.so -%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omniidlmodule.so.4 -%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omniidlmodule.so.4.2 +%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omniidlmodule.so.%%ABI_VER%% +%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omniidlmodule.so.%%ABI_VER%%.2 %%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniidl%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniidl%%PYTHON_EXT_SUFFIX%%.so.4 -%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniidl%%PYTHON_EXT_SUFFIX%%.so.4.2 +%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniidl%%PYTHON_EXT_SUFFIX%%.so.%%ABI_VER%% +%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniidl%%PYTHON_EXT_SUFFIX%%.so.%%ABI_VER%%.%%ABI_MAJOR_VER%% %%PYTHON_SITELIBDIR%%/omniidl/__init__.py %%PYTHON_SITELIBDIR%%/omniidl/__init__.pyc %%PYTHON_SITELIBDIR%%/omniidl/idlast.py
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201182031.20IKVFJh077297>