Date: Mon, 29 Apr 2019 12:41:14 +0000 (UTC) From: =?UTF-8?Q?Vin=c3=adcius_Zavam?= <egypcio@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r500408 - head/sysutils/openipmi Message-ID: <201904291241.x3TCfEmx059412@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: egypcio Date: Mon Apr 29 12:41:14 2019 New Revision: 500408 URL: https://svnweb.freebsd.org/changeset/ports/500408 Log: sysutils/openipmi: fix packaging with Python PR: 236554 Reported by: gergely.czuczy % harmless.hu Reviewed by: antoine, garga Approved by: araujo (mentor), rene (mentor) Differential Revision: https://reviews.freebsd.org/D20058 Modified: head/sysutils/openipmi/Makefile head/sysutils/openipmi/pkg-plist Modified: head/sysutils/openipmi/Makefile ============================================================================== --- head/sysutils/openipmi/Makefile Mon Apr 29 11:54:04 2019 (r500407) +++ head/sysutils/openipmi/Makefile Mon Apr 29 12:41:14 2019 (r500408) @@ -3,7 +3,7 @@ PORTNAME= openipmi PORTVERSION= 2.0.27 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/OpenIPMI%202.0%20Library DISTNAME= OpenIPMI-${PORTVERSION} @@ -24,6 +24,8 @@ GNU_CONFIGURE= yes INSTALL_TARGET= install-strip OPTIONS_DEFINE= GDBM GLIB20 PERL PYTHON SNMP SSL TCL TKINTER +TKINTER_IMPLIES= PYTHON + SSL_DESC= IPMI 2.0 RMCP+ encryption and authentication SNMP_DESC= SNMP trap support for the sample programs PERL_DESC= Perl interface for OpenIPMI library @@ -55,7 +57,7 @@ CONFIGURE_ARGS+= --with-openssl=no .endif .if ${PORT_OPTIONS:MTKINTER} -USES+= python shebangfix +USES+= shebangfix SHEBANG_FILES= swig/python/openipmigui.py BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \ ${LOCALBASE}/lib/Tix8.4.3/Tix.tcl:x11-toolkits/tix @@ -81,13 +83,15 @@ PLIST_SUB+= OIPMIPERL="@comment " .if ${PORT_OPTIONS:MPYTHON} USES+= python -CONFIGURE_ARGS+= --with-python --with-swig ac_cv_path_pythonprog=${PYTHON_CMD} +USE_PYTHON= py3kplist +CONFIGURE_ARGS+= --with-python --with-swig +CONFIGURE_ENV+= ac_cv_path_pythonprog=${PYTHON_CMD} BUILD_DEPENDS+= swig3.0:devel/swig30 -PLIST_SUB+= PYTHON="" +PLIST_SUB+= OIPMIPYTHON="" BINARY_ALIAS= swig=swig3.0 .else CONFIGURE_ARGS+= --with-python=no --with-swig=no -PLIST_SUB+= PYTHON="@comment " +PLIST_SUB+= OIPMIPYTHON="@comment " .endif .if ${PORT_OPTIONS:MTCL} @@ -128,5 +132,9 @@ post-patch: ${WRKSRC}/lanserv/Makefile.in ${REINPLACE_CMD} 's|editline/readline.h|edit/readline/readline.h|' \ ${WRKSRC}/sample/ipmi_serial_bmc_emu.c + +do-install-PYTHON-on: + @${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} && \ + ${PYTHON_CMD} -O -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} .include <bsd.port.mk> Modified: head/sysutils/openipmi/pkg-plist ============================================================================== --- head/sysutils/openipmi/pkg-plist Mon Apr 29 11:54:04 2019 (r500407) +++ head/sysutils/openipmi/pkg-plist Mon Apr 29 12:41:14 2019 (r500408) @@ -127,12 +127,12 @@ man/man7/openipmi_conparms.7.gz %%OIPMIPERL%%@comment files list for PERL %%OIPMIPERL%%%%SITE_ARCH%%/OpenIPMI.pm %%OIPMIPERL%%%%SITE_ARCH%%/auto/OpenIPMI/OpenIPMI.so -%%PYTHON%%@comment files list for PYTHON -%%PYTHON%%%%PYTHON_SITELIBDIR%%/OpenIPMI.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/OpenIPMI.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/OpenIPMI.pyo -%%PYTHON%%%%PYTHON_SITELIBDIR%%/_OpenIPMI.a -%%PYTHON%%%%PYTHON_SITELIBDIR%%/_OpenIPMI.so +%%OIPMIPYTHON%%@comment files list for PYTHON +%%OIPMIPYTHON%%%%PYTHON_SITELIBDIR%%/OpenIPMI.py +%%OIPMIPYTHON%%%%PYTHON_SITELIBDIR%%/OpenIPMI.pyc +%%OIPMIPYTHON%%%%PYTHON_SITELIBDIR%%/OpenIPMI.pyo +%%OIPMIPYTHON%%%%PYTHON_SITELIBDIR%%/_OpenIPMI.a +%%OIPMIPYTHON%%%%PYTHON_SITELIBDIR%%/_OpenIPMI.so %%TKINTER%%@comment files list for TKINTER %%TKINTER%%bin/openipmigui %%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/__init__.py
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904291241.x3TCfEmx059412>