Date: Tue, 13 Feb 2018 10:56:36 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r461694 - head/devel/omniORB Message-ID: <201802131056.w1DAua0p094336@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Tue Feb 13 10:56:36 2018 New Revision: 461694 URL: https://svnweb.freebsd.org/changeset/ports/461694 Log: Fix packaging with DEFAULT_VERSIONS=python=3.6 Modified: head/devel/omniORB/Makefile head/devel/omniORB/pkg-plist Modified: head/devel/omniORB/Makefile ============================================================================== --- head/devel/omniORB/Makefile Tue Feb 13 10:19:33 2018 (r461693) +++ head/devel/omniORB/Makefile Tue Feb 13 10:56:36 2018 (r461694) @@ -16,6 +16,7 @@ PLIST_SUB+= SONUM=2 GNU_CONFIGURE= yes USES= gmake pkgconfig python tar:bzip2 shebangfix ssl USE_LDCONFIG= yes +USE_PYTHON= py3kplist MAKEFILE= GNUmakefile CONFIGURE_ENV+= PYTHON=${PYTHON_CMD} CONFIGURE_ARGS= --datadir=${DATADIR} --with-openssl=${OPENSSLBASE} \ @@ -26,7 +27,8 @@ OPTIONS_DEFAULT= STATIC OPTIONS_SUB= yes STATIC_CONFIGURE_OFF= --disable-static WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:S/-2//} -SHEBANG_FILES= src/tool/omniidl/python/scripts/omniidlrun.py +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 @@ -48,7 +50,7 @@ post-install: libomnithread.so.4.0 @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${i} .endfor - @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_omniidlmodule.so.4.2 + @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/*.so post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/devel/omniORB/pkg-plist ============================================================================== --- head/devel/omniORB/pkg-plist Tue Feb 13 10:19:33 2018 (r461693) +++ head/devel/omniORB/pkg-plist Tue Feb 13 10:56:36 2018 (r461694) @@ -263,9 +263,12 @@ man/man8/omniMapper.8.gz man/man8/omniNames.8.gz man/man1/omnicpp.1.gz man/man1/omniidl.1.gz -%%PYTHON_SITELIBDIR%%/_omniidlmodule.so -%%PYTHON_SITELIBDIR%%/_omniidlmodule.so.4 -%%PYTHON_SITELIBDIR%%/_omniidlmodule.so.4.2 +%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omniidlmodule.so +%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omniidlmodule.so.4 +%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omniidlmodule.so.4.2 +%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniidl.so +%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniidl.so.4 +%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniidl.so.4.2 %%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?201802131056.w1DAua0p094336>