Date: Tue, 21 Oct 2014 16:53:38 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371327 - in head/devel: . py-omniorb py-omniorb-3 Message-ID: <201410211653.s9LGrcn8067730@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Tue Oct 21 16:53:38 2014 New Revision: 371327 URL: https://svnweb.freebsd.org/changeset/ports/371327 QAT: https://qat.redports.org/buildarchive/r371327/ Log: In order to rescue the Salomé's ports, devel/omniNotify and devel/py-omniorb are needed. But since omniNotify depends on devel/omniORB-4.1, a version of py-omniorb depending on the same omniORB is needed, to avoid conflicts. - Repocopy devel/py-omniorb to devel/py-omniorb-3 - Downgrade it to 3.7 - Set CONFLICTS. CR: D970 Added: head/devel/py-omniorb-3/ - copied from r371291, head/devel/py-omniorb/ Modified: head/devel/Makefile head/devel/py-omniorb-3/Makefile head/devel/py-omniorb-3/distinfo head/devel/py-omniorb-3/pkg-descr head/devel/py-omniorb-3/pkg-plist head/devel/py-omniorb/Makefile Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Tue Oct 21 16:36:12 2014 (r371326) +++ head/devel/Makefile Tue Oct 21 16:53:38 2014 (r371327) @@ -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 Modified: head/devel/py-omniorb-3/Makefile ============================================================================== --- head/devel/py-omniorb/Makefile Mon Oct 20 18:51:29 2014 (r371291) +++ head/devel/py-omniorb-3/Makefile Tue Oct 21 16:53:38 2014 (r371327) @@ -2,39 +2,39 @@ # $FreeBSD$ PORTNAME= omniorb -PORTVERSION= 4.2.0 +PORTVERSION= 3.7 CATEGORIES= devel python MASTER_SITES= SF/${PORTNAME}/omniORBpy/omniORBpy-${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMESUFFIX= 3 DISTNAME= omniORBpy-${PORTVERSION} -MAINTAINER= 5u623l20@gmail.com +MAINTAINER= ports@FreeBSD.org COMMENT= Python bindings for omniORB4, a CORBA 2.6 ORB LICENSE= LGPL21 -LIB_DEPENDS= libomniORB4.so:${PORTSDIR}/devel/omniORB -RUN_DEPENDS= omniidl:${PORTSDIR}/devel/omniORB +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:patch +BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/devel/omniORB-4.1:patch -CONFLICTS= py*-orbit-2* +CONFLICTS= py${PYTHON_SUFFIX}-orbit-2* py${PYTHON_SUFFIX}-omniorb-4.2* OPTIONS_DEFINE= DOCS EXAMPLES -PLIST_SUB= SONUM=2 +PLIST_SUB= SONUM=${PORTVERSION:C/.*\.//} CONFIGURE_WRKSRC= ${WRKSRC}/build BUILD_WRKSRC= ${CONFIGURE_WRKSRC} INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} -OMNIORB_WRKSRC!= cd ${.CURDIR}/../omniORB && ${MAKE} -V WRKSRC +OMNIORB_WRKSRC!= cd ${.CURDIR}/../omniORB-4.1 && ${MAKE} -V WRKSRC USE_OPENSSL= yes GNU_CONFIGURE= yes MAKEFILE= GNUmakefile USE_LDCONFIG= yes -USES= gmake tar:bzip2 python +USES= gmake python tar:bzip2 CONFIGURE_SCRIPT= ../configure CONFIGURE_ENV+= PYTHON=${PYTHON_CMD} @@ -43,20 +43,14 @@ CONFIGURE_ARGS= --with-openssl=${OPENSSL .include <bsd.port.options.mk> pre-configure: - @${MKDIR} ${CONFIGURE_WRKSRC} - @cd ${OMNIORB_WRKSRC} && ${FIND} idl | ${CPIO} --quiet -pdum ${WRKSRC} + ${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)" -# 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 - @${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/_omnipymodule.so.4.2 - @${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/_omniZIOPmodule.so.4.2 - @${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/_omniConnMgmtmodule.so.4.2 - @${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/_omnicodesetsmodule.so.4.2 - @${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/_omnisslTPmodule.so.4.2 .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR}/html @${MKDIR} ${STAGEDIR}${DOCSDIR}/tex Modified: head/devel/py-omniorb-3/distinfo ============================================================================== --- head/devel/py-omniorb/distinfo Mon Oct 20 18:51:29 2014 (r371291) +++ head/devel/py-omniorb-3/distinfo Tue Oct 21 16:53:38 2014 (r371327) @@ -1,2 +1,2 @@ -SHA256 (omniORBpy-4.2.0.tar.bz2) = c82b3bafacbb93cfaace41765219155f2b24eb3781369bba0581feb1dc50fe5e -SIZE (omniORBpy-4.2.0.tar.bz2) = 653795 +SHA256 (omniORBpy-3.7.tar.bz2) = 64ddd49581b4f5dde04b8ed80d81ae96fd7efb1f8f6c8075aaf56de9522c1136 +SIZE (omniORBpy-3.7.tar.bz2) = 610025 Modified: head/devel/py-omniorb-3/pkg-descr ============================================================================== --- head/devel/py-omniorb/pkg-descr Mon Oct 20 18:51:29 2014 (r371291) +++ head/devel/py-omniorb-3/pkg-descr Tue Oct 21 16:53:38 2014 (r371327) @@ -3,21 +3,6 @@ specification 2.6 of the Common Object R omniORBpy is implemented as a Python extension module (written in C++) to provide bindings for omniORB4, a high performance C++ ORB. -Some features of omniORB4: -- Support for GIOP and IIOP 1.0, 1.1 and 1.2. -- Fully multithreaded runtime. -- TypeCode and type Any. -- CORBA 2.6 DynAny interfaces. -- Dynamic Invocation and Dynamic Skeleton interfaces. -- Complete Naming Service, omniNames. -- Support for wchar, wstring and code set negotiation. -- Full long long, long double, fixed point support. -- PortableServer::Current. -- Unix domain socket transport. -- Bidirectional GIOP. -- Interoperable Secure Socket Layer transport. -- Flexible thread management. -- Interceptors. -- Fully interoperable with other CORBA ORBs. +This is the legacy version, based upon omniORB-4.1. WWW: http://omniorb.sourceforge.net Modified: head/devel/py-omniorb-3/pkg-plist ============================================================================== --- head/devel/py-omniorb/pkg-plist Mon Oct 20 18:51:29 2014 (r371291) +++ head/devel/py-omniorb-3/pkg-plist Tue Oct 21 16:53:38 2014 (r371327) @@ -13,27 +13,22 @@ include/omniORBpy.h %%PYTHON_SITELIBDIR%%/PortableServer__POA.py %%PYTHON_SITELIBDIR%%/PortableServer__POA.pyc %%PYTHON_SITELIBDIR%%/_omniConnMgmtmodule.so -%%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%%/_omniConnMgmtmodule.so.3 +%%PYTHON_SITELIBDIR%%/_omniConnMgmtmodule.so.3.%%SONUM%% %%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so -%%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so.4 -%%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so.4.%%SONUM%% +%%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so.3 +%%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so.3.%%SONUM%% %%PYTHON_SITELIBDIR%%/_omnipymodule.so -%%PYTHON_SITELIBDIR%%/_omnipymodule.so.4 -%%PYTHON_SITELIBDIR%%/_omnipymodule.so.4.%%SONUM%% +%%PYTHON_SITELIBDIR%%/_omnipymodule.so.3 +%%PYTHON_SITELIBDIR%%/_omnipymodule.so.3.%%SONUM%% %%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so -%%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so.4 -%%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so.4.%%SONUM%% +%%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/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 @@ -301,44 +296,28 @@ include/omniORBpy.h %%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 %%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 %%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/python.py %%PYTHON_SITELIBDIR%%/omniidl_be/python.pyc %%PORTDOCS%%%%DOCSDIR%%/html/contents_motif.gif @@ -357,15 +336,10 @@ include/omniORBpy.h %%PORTDOCS%%%%DOCSDIR%%/html/omniORBpy009.html %%PORTDOCS%%%%DOCSDIR%%/html/omniORBpy010.html %%PORTDOCS%%%%DOCSDIR%%/html/omniORBpy011.html -%%PORTDOCS%%%%DOCSDIR%%/html/omniORBpy012.html -%%PORTDOCS%%%%DOCSDIR%%/html/omniORBpy013.html %%PORTDOCS%%%%DOCSDIR%%/html/previous_motif.gif %%PORTDOCS%%%%DOCSDIR%%/omniORBpy.pdf %%PORTDOCS%%%%DOCSDIR%%/tex/omniORBpy.bib %%PORTDOCS%%%%DOCSDIR%%/tex/omniORBpy.tex -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ami/ami_callback.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ami/ami_poller.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ami/example_echo.idl %%PORTEXAMPLES%%%%EXAMPLESDIR%%/echo/echo.idl %%PORTEXAMPLES%%%%EXAMPLESDIR%%/echo/echo_clt.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/echo/echo_srv.py @@ -389,6 +363,9 @@ include/omniORBpy.h %%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 @@ -406,5 +383,8 @@ include/omniORBpy.h %%PORTEXAMPLES%%%%EXAMPLESDIR%%/valuetype/tests/server.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/valuetype/tests/value1.idl %%PORTEXAMPLES%%%%EXAMPLESDIR%%/valuetype/tests/value2.idl -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ziop/ziop_clt.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ziop/ziop_srv.py +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/weather/README +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/weather/gauge.py +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/weather/weather.py +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/weather/weatherInfo.idl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/weather/wserver.py Modified: head/devel/py-omniorb/Makefile ============================================================================== --- head/devel/py-omniorb/Makefile Tue Oct 21 16:36:12 2014 (r371326) +++ head/devel/py-omniorb/Makefile Tue Oct 21 16:53:38 2014 (r371327) @@ -19,7 +19,7 @@ RUN_DEPENDS= omniidl:${PORTSDIR}/devel/o # 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410211653.s9LGrcn8067730>