Attachment 148079 Details for Bug 194195 – patch for py-omniorb-4.2.0

[patch] patch for py-omniorb-4.2.0

py-omniorb-4.2.0.patch (text/plain), 10.00 KB, created by Muhammad Moinur Rahman on 2014-10-07 19:40:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Muhammad Moinur Rahman

Created: 2014-10-07 19:40:36 UTC

Size: 10.00 KB

patch

obsolete

>diff -ruN /usr/ports//devel/py-omniorb/Makefile ./Makefile
>--- /usr/ports//devel/py-omniorb/Makefile	2014-08-30 23:16:02.000000000 +0600
>+++ ./Makefile	2014-10-08 01:10:36.584957116 +0600
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/devel/py-omniorb/Makefile 366649 2014-08-30 17:16:02Z antoine $
> 
> PORTNAME=	omniorb
>-PORTVERSION=	3.7
>+PORTVERSION=	4.2.0
> CATEGORIES=	devel python
> MASTER_SITES=	SF/${PORTNAME}/omniORBpy/omniORBpy-${PORTVERSION}
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,8 +13,6 @@
> 
> LICENSE=	LGPL21
> 
>-BROKEN=		Fails to build with new omniORB
>-
> LIB_DEPENDS=	libomniORB4.so:${PORTSDIR}/devel/omniORB
> RUN_DEPENDS=	omniidl:${PORTSDIR}/devel/omniORB
> # parts of omniORB4 source tree is required to build omniORBpy;
>@@ -25,39 +23,50 @@
> 
> OPTIONS_DEFINE=	DOCS EXAMPLES
> 
>-PLIST_SUB=	SONUM=${PORTVERSION:C/.*\.//}
>+PLIST_SUB=	SONUM=2
> 
> CONFIGURE_WRKSRC=	${WRKSRC}/build
> BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
> INSTALL_WRKSRC=	${CONFIGURE_WRKSRC}
> OMNIORB_WRKSRC!=	cd ${.CURDIR}/../omniORB && ${MAKE} -V WRKSRC
> 
>-USE_PYTHON=	yes
> USE_OPENSSL=	yes
> GNU_CONFIGURE=	yes
> MAKEFILE=	GNUmakefile
> USE_LDCONFIG=	yes
>-USES=		gmake tar:bzip2
>+USES=		gmake tar:bzip2 python
> 
> CONFIGURE_SCRIPT=	../configure
> CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD}
> CONFIGURE_ARGS=	--with-openssl=${OPENSSLBASE} --with-omniorb=${LOCALBASE}
> 
>+.include <bsd.port.options.mk>
> pre-configure:
> 	@${MKDIR} ${CONFIGURE_WRKSRC}
> 	@cd ${OMNIORB_WRKSRC} && ${FIND} idl | ${CPIO} --quiet -pdum ${WRKSRC}
> 
> post-install:
>+	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
> 	${INSTALL_DATA} ${WRKSRC}/doc/omniORBpy.* ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${WRKSRC}/doc/omniORBpy/* ${STAGEDIR}${DOCSDIR}/html
> 	${INSTALL_DATA} ${WRKSRC}/doc/tex/* ${STAGEDIR}${DOCSDIR}/tex
>+.endif
>+.if ${PORT_OPTIONS:MEXAMPLES}
> 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
> 	cd ${WRKSRC}/examples && ${FIND} . \
> 	  | ${CPIO} --quiet -pdum -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${EXAMPLESDIR}
>-	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)"
>+.endif
> 
> .include <bsd.port.mk>
>diff -ruN /usr/ports//devel/py-omniorb/distinfo ./distinfo
>--- /usr/ports//devel/py-omniorb/distinfo	2014-04-27 00:13:09.000000000 +0600
>+++ ./distinfo	2014-10-08 00:45:15.713063497 +0600
>@@ -1,2 +1,2 @@
>-SHA256 (omniORBpy-3.7.tar.bz2) = 64ddd49581b4f5dde04b8ed80d81ae96fd7efb1f8f6c8075aaf56de9522c1136
>-SIZE (omniORBpy-3.7.tar.bz2) = 610025
>+SHA256 (omniORBpy-4.2.0.tar.bz2) = c82b3bafacbb93cfaace41765219155f2b24eb3781369bba0581feb1dc50fe5e
>+SIZE (omniORBpy-4.2.0.tar.bz2) = 653795
>diff -ruN /usr/ports//devel/py-omniorb/pkg-plist ./pkg-plist
>--- /usr/ports//devel/py-omniorb/pkg-plist	2014-04-27 00:13:09.000000000 +0600
>+++ ./pkg-plist	2014-10-08 01:16:40.598932854 +0600
>@@ -13,22 +13,27 @@
> %%PYTHON_SITELIBDIR%%/PortableServer__POA.py
> %%PYTHON_SITELIBDIR%%/PortableServer__POA.pyc
> %%PYTHON_SITELIBDIR%%/_omniConnMgmtmodule.so
>-%%PYTHON_SITELIBDIR%%/_omniConnMgmtmodule.so.3
>-%%PYTHON_SITELIBDIR%%/_omniConnMgmtmodule.so.3.%%SONUM%%
>+%%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.3
>-%%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so.3.%%SONUM%%
>+%%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so.4
>+%%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so.4.%%SONUM%%
> %%PYTHON_SITELIBDIR%%/_omnipymodule.so
>-%%PYTHON_SITELIBDIR%%/_omnipymodule.so.3
>-%%PYTHON_SITELIBDIR%%/_omnipymodule.so.3.%%SONUM%%
>+%%PYTHON_SITELIBDIR%%/_omnipymodule.so.4
>+%%PYTHON_SITELIBDIR%%/_omnipymodule.so.4.%%SONUM%%
> %%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so
>-%%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so.3
>-%%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so.3.%%SONUM%%
>+%%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so.4
>+%%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so.4.%%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
>@@ -296,28 +301,44 @@
> %%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
>@@ -336,10 +357,15 @@
> %%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
>@@ -363,9 +389,6 @@
> %%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
>@@ -383,18 +406,13 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/valuetype/tests/server.py
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/valuetype/tests/value1.idl
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/valuetype/tests/value2.idl
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/weather/README
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/weather/gauge.py
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/weather/weather.py
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/weather/weatherInfo.idl
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/weather/wserver.py
>-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/weather
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ziop/ziop_clt.py
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ziop/ziop_srv.py
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/valuetype/tests
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/valuetype/simple
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/valuetype
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tictactoe
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tests
>-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/random
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/poa
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/fortune
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/embed

Flags:

bofh: maintainer-approval+

Actions: View | Diff

Attachments on bug 194195: 148038 | 148069 | 148079