diff --git a/devel/py-pyinstaller/Makefile b/devel/py-pyinstaller/Makefile --- a/devel/py-pyinstaller/Makefile +++ b/devel/py-pyinstaller/Makefile @@ -1,38 +1,25 @@ PORTNAME= pyinstaller -PORTVERSION= 3.5 -PORTREVISION= 1 +PORTVERSION= 5.12.0 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= PyInstaller-${PORTVERSION} +DISTNAME= pyinstaller-${PORTVERSION} -MAINTAINER= python@FreeBSD.org +MAINTAINER= hsw@bitmark.com COMMENT= Program to create standalone executables from Python scripts WWW= https://www.pyinstaller.org/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}altgraph>0:math/py-altgraph@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}altgraph>0:math/py-altgraph@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyinstaller-hooks-contrib>0:devel/py-pyinstaller-hooks-contrib@${PY_FLAVOR} USES= cpe python USE_PYTHON= autoplist concurrent distutils -EXTRACT_AFTER_ARGS= --exclude doc/source --no-same-owner --no-same-permissions -DOCSDIR= ${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME} -PORTDOCS= *.txt - -OPTIONS_DEFINE= DOCS MANPAGES -OPTIONS_DEFAULT= MANPAGES -OPTIONS_SUB= yes - -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} -DOCS_MAKE_ARGS= SPHINXBUILD=sphinx-build-${PYTHON_VER} -DOCS_USES= gmake -MANPAGES_BUILD_DEPENDS= ${DOCS_BUILD_DEPENDS} -MANPAGES_MAKE_ARGS= ${DOCS_MAKE_ARGS} -MANPAGES_USES= gmake +EXTRACT_AFTER_ARGS= --no-same-owner --no-same-permissions post-patch: @${REINPLACE_CMD} -e '/install_requires/s,distribute,setuptools,' \ @@ -45,14 +32,4 @@ cd ${WRKSRC}/bootloader && \ ${PYTHON_CMD} waf all -do-install-MANPAGES-on: - ( cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} man ${MAKE_ARGS}) - ( cd ${WRKSRC}/doc/_build/man ; ${INSTALL_MAN} pyi-makespec.1 pyinstaller.1 \ - ${STAGEDIR}${PREFIX}/share/man/man1 ) - -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC}/doc ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} text ${MAKE_ARGS}) - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/_build/text/|} ${STAGEDIR}${DOCSDIR} - .include diff --git a/devel/py-pyinstaller/distinfo b/devel/py-pyinstaller/distinfo --- a/devel/py-pyinstaller/distinfo +++ b/devel/py-pyinstaller/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562773511 -SHA256 (PyInstaller-3.5.tar.gz) = ee7504022d1332a3324250faf2135ea56ac71fdb6309cff8cd235de26b1d0a96 -SIZE (PyInstaller-3.5.tar.gz) = 3518991 +TIMESTAMP = 1696303521 +SHA256 (pyinstaller-5.12.0.tar.gz) = a1c2667120730604c3ad1e0739a45bb72ca4a502a91e2f5c5b220fbfbb05f0d4 +SIZE (pyinstaller-5.12.0.tar.gz) = 4085927 diff --git a/devel/py-pyinstaller/files/patch-bootloader_src_main.c b/devel/py-pyinstaller/files/patch-bootloader_src_main.c --- a/devel/py-pyinstaller/files/patch-bootloader_src_main.c +++ b/devel/py-pyinstaller/files/patch-bootloader_src_main.c @@ -1,6 +1,6 @@ ---- bootloader/src/main.c.orig 2019-07-09 19:14:04 UTC +--- bootloader/src/main.c.orig 2023-02-11 14:47:39 UTC +++ bootloader/src/main.c -@@ -16,6 +16,11 @@ +@@ -19,6 +19,11 @@ * main: For OS X and Linux */ @@ -12,7 +12,7 @@ #ifdef _WIN32 #include #include -@@ -33,9 +38,6 @@ +@@ -36,9 +41,6 @@ #include "pyi_global.h" #include "pyi_win32_utils.h" @@ -22,20 +22,19 @@ #if defined(_WIN32) #define MS_WINDOWS -@@ -87,19 +89,12 @@ main(int argc, char **argv) +@@ -89,18 +91,6 @@ int + main(int argc, char **argv) { int res; - +- - #ifdef __FreeBSD__ - fp_except_t m; -- #endif - - /* 754 requires that FP exceptions run in "no stop" mode by default, - * and until C vendors implement C99's ways to control FP exceptions, - * Python requires non-stop mode. Alas, some platforms enable FP - * exceptions by default. Here we disable them. - */ -- #ifdef __FreeBSD__ +- +- /* 754 requires that FP exceptions run in "no stop" mode by default, +- * and until C vendors implement C99's ways to control FP exceptions, +- * Python requires non-stop mode. Alas, some platforms enable FP +- * exceptions by default. Here we disable them. +- */ - m = fpgetmask(); - fpsetmask(m & ~FP_X_OFL); - #endif diff --git a/devel/py-pyinstaller/files/patch-bootloader_wscript b/devel/py-pyinstaller/files/patch-bootloader_wscript deleted file mode 100644 --- a/devel/py-pyinstaller/files/patch-bootloader_wscript +++ /dev/null @@ -1,20 +0,0 @@ ---- bootloader/wscript.orig 2018-09-22 05:02:42 UTC -+++ bootloader/wscript -@@ -361,7 +361,7 @@ def set_arch_flags(ctx): - # or vice versa or with manually choosen --target-arch. - # Option -m32/-m64 has to be passed to cflags and linkflages. - elif ctx.env.PYI_ARCH == '32bit': -- if machine() in ('arm', 'aarch') and ctx.env.DEST_OS == 'linux': -+ if ctx.env.CC_NAME == "gcc": - # It was reported that flag '-m32' does not work with gcc - # on 32-bit arm Linux. So skip the -m32 flag. - pass -@@ -377,7 +377,7 @@ def set_arch_flags(ctx): - if ctx.env.DEST_OS == 'win32': - ctx.env.append_value('LINKFLAGS', '-Wl,--large-address-aware') - elif ctx.env.PYI_ARCH == '64bit': -- if machine() in ('arm', 'aarch') and ctx.env.DEST_OS == 'linux': -+ if ctx.env.CC_NAME == 'gcc': - # flag '-m64' does not work with gcc on 64-bit arm/aarch Linux. - pass - else: diff --git a/devel/py-pyinstaller/files/patch-doc_help2rst.py b/devel/py-pyinstaller/files/patch-doc_help2rst.py deleted file mode 100644 --- a/devel/py-pyinstaller/files/patch-doc_help2rst.py +++ /dev/null @@ -1,12 +0,0 @@ ---- doc/help2rst.py.orig 2019-07-09 19:14:04 UTC -+++ doc/help2rst.py -@@ -63,6 +63,9 @@ def process(program, generate_headings, headings_chara - elif '\noptional arguments:' in help: - # argparse style - help = help.split('\noptional arguments:', 1)[1] -+ elif '\noptions:' in help: -+ # argparse style, since python 3.10 -+ help = help.split('\noptions:', 1)[1] - else: - raise SystemError('unexpected format of output for --help') - # Remove any obsolete options diff --git a/devel/py-pyinstaller/pkg-plist b/devel/py-pyinstaller/pkg-plist deleted file mode 100644 --- a/devel/py-pyinstaller/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -%%MANPAGES%%share/man/man1/pyi-makespec.1.gz -%%MANPAGES%%share/man/man1/pyinstaller.1.gz