Date: Sun, 13 Jan 2019 10:24:38 +0000 (UTC) From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490123 - head/devel/py-omniorb Message-ID: <201901131024.x0DAOctY092311@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bofh Date: Sun Jan 13 10:24:38 2019 New Revision: 490123 URL: https://svnweb.freebsd.org/changeset/ports/490123 Log: devel/py-omniorb: Fix build with DEFAULT_VERSIONS=python=3.x PR: 234683 Reported by: antoine Modified: head/devel/py-omniorb/Makefile head/devel/py-omniorb/pkg-plist Modified: head/devel/py-omniorb/Makefile ============================================================================== --- head/devel/py-omniorb/Makefile Sun Jan 13 10:14:23 2019 (r490122) +++ head/devel/py-omniorb/Makefile Sun Jan 13 10:24:38 2019 (r490123) @@ -3,6 +3,7 @@ PORTNAME= omniorb DISTVERSION= 4.2.3 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= SF/${PORTNAME}/omniORBpy/omniORBpy-${DISTVERSION:S/-2//} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -19,11 +20,18 @@ RUN_DEPENDS= omniidl:devel/omniORB # see also the "post-extract" target below. BUILD_DEPENDS= ${NONEXISTENT}:devel/omniORB:patch -USES= gmake python shebangfix ssl tar:bzip2 +USES= gmake shebangfix ssl tar:bzip2 +USE_PYTHON= py3kplist CONFLICTS= py*-orbit-2* ${PYTHON_PKGNAMEPREFIX}omniorb3-3* -OPTIONS_DEFINE= DOCS EXAMPLES +OPTIONS_DEFINE= DOCS EXAMPLES PYTHON2 PYTHON3 +OPTIONS_DEFAULT=PYTHON3 +OPTIONS_SUB= yes +PYTHON2_DESC= Build and install Python 2.X packages +PYTHON3_DESC= Build and install Python 3.X packages +PYTHON2_USES= python:2.7 +PYTHON3_USES= python:3.6+ PLIST_SUB= SONUM=2 @@ -51,11 +59,6 @@ post-install: 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)" @${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 post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/html Modified: head/devel/py-omniorb/pkg-plist ============================================================================== --- head/devel/py-omniorb/pkg-plist Sun Jan 13 10:14:23 2019 (r490122) +++ head/devel/py-omniorb/pkg-plist Sun Jan 13 10:24:38 2019 (r490123) @@ -12,21 +12,36 @@ include/omniORBpy.h %%PYTHON_SITELIBDIR%%/PortableServer.pyc %%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%%/_omnicodesetsmodule.so -%%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so.4 -%%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so.4.%%SONUM%% -%%PYTHON_SITELIBDIR%%/_omnipymodule.so -%%PYTHON_SITELIBDIR%%/_omnipymodule.so.4 -%%PYTHON_SITELIBDIR%%/_omnipymodule.so.4.%%SONUM%% -%%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so -%%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so.4 -%%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so.4.%%SONUM%% +%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omniConnMgmtmodule.so +%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omniConnMgmtmodule.so.4 +%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omniConnMgmtmodule.so.4.%%SONUM%% +%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniConnMgmt.so +%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniConnMgmt.so.4 +%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniConnMgmt.so.4.2 +%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omniZIOPmodule.so +%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omniZIOPmodule.so.4 +%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omniZIOPmodule.so.4.%%SONUM%% +%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniZIOP.so +%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniZIOP.so.4 +%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniZIOP.so.4.2 +%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so +%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so.4 +%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so.4.%%SONUM%% +%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omnicodesets.so +%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omnicodesets.so.4 +%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omnicodesets.so.4.2 +%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omnipymodule.so +%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omnipymodule.so.4 +%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omnipymodule.so.4.%%SONUM%% +%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omnipy.so +%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omnipy.so.4 +%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omnipy.so.4.2 +%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so +%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so.4 +%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so.4.%%SONUM%% +%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omnisslTP.so +%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omnisslTP.so.4 +%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omnisslTP.so.4.2 %%PYTHON_SITELIBDIR%%/omniORB.pth %%PYTHON_SITELIBDIR%%/omniORB/BiDirPolicy.py %%PYTHON_SITELIBDIR%%/omniORB/BiDirPolicy.pyc @@ -341,6 +356,7 @@ include/omniORBpy.h %%PYTHON_SITELIBDIR%%/omniORB/ziop_idl.pyc %%PYTHON_SITELIBDIR%%/omniidl_be/python.py %%PYTHON_SITELIBDIR%%/omniidl_be/python.pyc +%%PYTHON3%%%%PYTHON_SITELIBDIR%%/omniidl_be/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc %%PORTDOCS%%%%DOCSDIR%%/html/contents_motif.gif %%PORTDOCS%%%%DOCSDIR%%/html/index.html %%PORTDOCS%%%%DOCSDIR%%/html/next_motif.gif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901131024.x0DAOctY092311>