From owner-svn-ports-head@freebsd.org Tue Feb 13 10:56:37 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 83E0EF15ADB; Tue, 13 Feb 2018 10:56:37 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 31DCB71A8C; Tue, 13 Feb 2018 10:56:37 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 225191FD52; Tue, 13 Feb 2018 10:56:37 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1DAub6m094338; Tue, 13 Feb 2018 10:56:37 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1DAua0p094336; Tue, 13 Feb 2018 10:56:36 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201802131056.w1DAua0p094336@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Tue, 13 Feb 2018 10:56:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r461694 - head/devel/omniORB X-SVN-Group: ports-head X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: head/devel/omniORB X-SVN-Commit-Revision: 461694 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Feb 2018 10:56:37 -0000 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