From 68833e260644e6a3b7eb1a37b8a72393ded933f7 Mon Sep 17 00:00:00 2001
From: antoine <antoine@FreeBSD.org>
Date: Tue, 13 Feb 2018 10:56:36 +0000
Subject: Fix packaging with DEFAULT_VERSIONS=python=3.6

---
 devel/omniORB/Makefile  | 6 ++++--
 devel/omniORB/pkg-plist | 9 ++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'devel')

diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile
index 7d5b4a9306ed..74267dafe8c0 100644
--- a/devel/omniORB/Makefile
+++ b/devel/omniORB/Makefile
@@ -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}
diff --git a/devel/omniORB/pkg-plist b/devel/omniORB/pkg-plist
index c4cd9f7c634f..c34a8486c7eb 100644
--- a/devel/omniORB/pkg-plist
+++ b/devel/omniORB/pkg-plist
@@ -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
-- 
cgit