diff --git a/multimedia/gaupol/Makefile b/multimedia/gaupol/Makefile index a61010f0dc13..ed40c1f23e79 100644 --- a/multimedia/gaupol/Makefile +++ b/multimedia/gaupol/Makefile @@ -1,42 +1,42 @@ PORTNAME= gaupol DISTVERSION= 1.15 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia python MAINTAINER= nxjoseph@FreeBSD.org COMMENT= Subtitle editor WWW= https://otsaloma.io/gaupol/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}charset-normalizer>=2.0:textproc/py-charset-normalizer@${PY_FLAVOR} \ gspell>=1.0.0:textproc/gspell \ iso-codes>=3.67:misc/iso-codes USES= desktop-file-utils gnome gstreamer python USE_GITHUB= yes GH_ACCOUNT= otsaloma USE_GNOME= gtk30 intltool pygobject3 USE_GSTREAMER= bad good gtk libav pango ugly USE_PYTHON= autoplist distutils flavors NO_ARCH= yes OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_USES= gettext-runtime gettext-tools NLS_USES_OFF= gettext-tools .include # PYDISTUTILS_INSTALLNOSINGLE is deprecated so... PYDISTUTILS_INSTALLARGS:= ${PYDISTUTILS_INSTALLARGS:N--single-version-externally-managed} post-patch: @${REINPLACE_CMD} -e 's|%%STAGEDIR%%|"${STAGEDIR}"|' \ -e 's|%%PREFIX%%|"${PREFIX}"|' \ -e 's|#!/usr/bin/env python3|#!${PYTHON_CMD}|' \ ${WRKSRC}/setup.py .include diff --git a/multimedia/gaupol/files/patch-setup.py b/multimedia/gaupol/files/patch-setup.py index 153b67fdd09d..8e5c418b6123 100644 --- a/multimedia/gaupol/files/patch-setup.py +++ b/multimedia/gaupol/files/patch-setup.py @@ -1,14 +1,28 @@ ---- setup.py.orig 2018-05-27 20:40:27 UTC +--- setup.py.orig 2024-06-10 18:55:29 UTC +++ setup.py -@@ -232,7 +232,10 @@ class InstallData(install_data): +@@ -100,12 +100,10 @@ class Clean(clean): + for targets in [glob.glob(x.strip()) for x in f]: + for target in filter(os.path.isdir, targets): + log.info("removing {}".format(target)) +- if not self.dry_run: +- shutil.rmtree(target) ++ shutil.rmtree(target) + for target in filter(os.path.isfile, targets): + log.info("removing {}".format(target)) +- if not self.dry_run: +- os.remove(target) ++ os.remove(target) + f.close() + + +@@ -219,7 +217,9 @@ class InstallData(install_data): data_dir = get_command_obj("install_data").install_dir data_dir = os.path.join(data_dir, "share", "gaupol") files = glob.glob("{}/extensions/*/*.py".format(data_dir)) - distutils.util.byte_compile(files, optimize, self.force, self.dry_run) + distutils.util.byte_compile(files, optimize, self.force, + base_dir=%%PREFIX%%, -+ prefix=%%STAGEDIR%%, -+ dry_run=self.dry_run) ++ prefix=%%STAGEDIR%%,) # Figure out paths of the compiled files and add them to # self.outfiles so that 'setup.py --record' works correctly. def get_cache_pattern(path):