svn commit: r502774 - head/devel/py-omniorb

[Antoine Brodin]

Author: antoine
Date: Mon May 27 08:26:54 2019
New Revision: 502774
URL: https://svnweb.freebsd.org/changeset/ports/502774

Log:
  Fix installation (conflict with omniorb it depends on)

Modified:
  head/devel/py-omniorb/Makefile
  head/devel/py-omniorb/pkg-plist

Modified: head/devel/py-omniorb/Makefile
==============================================================================
--- head/devel/py-omniorb/Makefile	Mon May 27 07:27:53 2019	(r502773)
+++ head/devel/py-omniorb/Makefile	Mon May 27 08:26:54 2019	(r502774)
@@ -3,7 +3,7 @@
 
 PORTNAME=	omniorb
 DISTVERSION=	4.2.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel python
 MASTER_SITES=	SF/${PORTNAME}/omniORBpy/omniORBpy-${DISTVERSION:S/-2//}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -52,7 +52,8 @@ 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)"
-	@${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/omniidl_be/__init__.py
+	@${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/omniidl_be/__init__.py* \
+		${STAGEDIR}${PYTHON_SITELIBDIR}/omniidl_be/__pycache__/__init__.*
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html

Modified: head/devel/py-omniorb/pkg-plist
==============================================================================
--- head/devel/py-omniorb/pkg-plist	Mon May 27 07:27:53 2019	(r502773)
+++ head/devel/py-omniorb/pkg-plist	Mon May 27 08:26:54 2019	(r502774)
@@ -356,7 +356,6 @@ 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