devel/py-pyinstaller: Update to 6.3.0

PR:		276396

6 files changed, 58 insertions, 96 deletions

diff --git a/devel/py-pyinstaller/Makefile b/devel/py-pyinstaller/Makefile
index 39b4a6fcdcca..45c6d5ee25e0 100644
--- a/devel/py-pyinstaller/Makefile
+++ b/devel/py-pyinstaller/Makefile
@@ -1,58 +1,62 @@
 PORTNAME=	pyinstaller
-PORTVERSION=	3.5
-PORTREVISION=	1
+DISTVERSION=	6.3.0
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-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=	APACHE20 GPLv2 MIT
+LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}altgraph>0:math/py-altgraph@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}altgraph>0:math/py-altgraph@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sphinx-autodoc-typehints>0:textproc/py-sphinx-autodoc-typehints@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sphinx-issues>0:textproc/py-sphinx-issues@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-towncrier>0:textproc/py-sphinxcontrib-towncrier@${PY_FLAVOR} \
+		${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} \
+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}execnet>0:sysutils/py-execnet@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}
 
 USES=		cpe python
-USE_PYTHON=	autoplist concurrent distutils
+USE_PYTHON=	autoplist concurrent pep517 pytest
 
-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
+PLIST_FILES=	share/man/man1/pyi-makespec.1.gz \
+		share/man/man1/pyinstaller.1.gz
 
-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
+PORTDOCS=	*
 
-post-patch:
-	@${REINPLACE_CMD} -e '/install_requires/s,distribute,setuptools,' \
-		${WRKSRC}/${PYSETUP}
-	@${REINPLACE_CMD} -e '/\/sbin\/ldconfig/s,-p,-r,' \
-		${WRKSRC}/PyInstaller/depend/utils.py
-	${INSTALL_DATA} ${WRKSRC}/PyInstaller/utils/cliutils/makespec.py ${WRKSRC}/makespec.py
+OPTIONS_DEFINE=	DOCS
 
 pre-build:
 	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-build-DOCS-on:
+	(cd ${WRKSRC}/doc && \
+		${SETENV} sphinx-build-${PYTHON_VER} -b html . _build/html)
+
+post-build:
+	(cd ${WRKSRC}/doc && \
+		${SETENV} sphinx-build-${PYTHON_VER} -b man . _build/man)
 
 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}
+	(cd ${WRKSRC}/doc/_build/html && \
+		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "-not -name .buildinfo -not -regex ^./.doctrees.* -not -regex ^./_sources.*")
+
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/doc/_build/man/*.1 \
+		${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/devel/py-pyinstaller/distinfo b/devel/py-pyinstaller/distinfo
index 4d4f7a6a5b41..e5c1067494aa 100644
--- 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 = 1705445280
+SHA256 (pyinstaller-6.3.0.tar.gz) = 914d4c96cc99472e37ac552fdd82fbbe09e67bb592d0717fcffaa99ea74273df
+SIZE (pyinstaller-6.3.0.tar.gz) = 4133400
diff --git a/devel/py-pyinstaller/files/patch-bootloader_src_main.c b/devel/py-pyinstaller/files/patch-bootloader_src_main.c
index 31d9b2c6b3b6..22c1b90b34ef 100644
--- a/devel/py-pyinstaller/files/patch-bootloader_src_main.c
+++ b/devel/py-pyinstaller/files/patch-bootloader_src_main.c
@@ -1,44 +1,36 @@
---- bootloader/src/main.c.orig	2019-07-09 19:14:04 UTC
+--- bootloader/src/main.c.orig	2024-01-16 22:55:44 UTC
 +++ bootloader/src/main.c
-@@ -16,6 +16,11 @@
-  * main: For OS X and Linux
-  */
+@@ -36,7 +36,9 @@
+ #include "pyi_win32_utils.h"
  
-+#ifdef __FreeBSD__
+ #ifdef __FreeBSD__
 +    #include <sys/cdefs.h>
-+    #include <floatingpoint.h>
+     #include <floatingpoint.h>
 +    #include <ieeefp.h>
-+#endif
- #ifdef _WIN32
-     #include <windows.h>
-     #include <wchar.h>
-@@ -33,9 +38,6 @@
- #include "pyi_global.h"
- #include "pyi_win32_utils.h"
- 
--#ifdef __FreeBSD__
--    #include <floatingpoint.h>
--#endif
+ #endif
  
  #if defined(_WIN32)
-     #define MS_WINDOWS
-@@ -87,19 +89,12 @@ main(int argc, char **argv)
+@@ -88,21 +90,9 @@ main(int argc, char **argv)
+ 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
  
      res = pyi_main(argc, argv);
      return res;
+ }
+ 
+-#endif  /* defined(WIN32) */
++#endif  /* defined(WIN32) */
+\ No newline at end of file
diff --git a/devel/py-pyinstaller/files/patch-bootloader_wscript b/devel/py-pyinstaller/files/patch-bootloader_wscript
deleted file mode 100644
index baea274356e0..000000000000
--- 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
index a3be2b618b1a..000000000000
--- 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
index 83e7d3387f90..000000000000
--- 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