Date: Wed, 6 Dec 2023 12:36:05 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 285b19417fff - main - security/py-pass-audit: Honor PREFIX Message-ID: <202312061236.3B6Ca5TA033114@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=285b19417fff7a4cccebf9769b6a339631ccd5e5 commit 285b19417fff7a4cccebf9769b6a339631ccd5e5 Author: Tobias Rehbein <tobias.rehbein@web.de> AuthorDate: 2023-12-06 11:43:27 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2023-12-06 12:35:50 +0000 security/py-pass-audit: Honor PREFIX Since the update to release 1.2, the port has no longer taken PREFIX into account. This oversight is corrected with this commit. PR: 275561 Approved by: submitter is maintainer --- security/py-pass-audit/Makefile | 2 ++ security/py-pass-audit/files/patch-setup.py | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/security/py-pass-audit/Makefile b/security/py-pass-audit/Makefile index dd965877f59d..1a4f7d7423ea 100644 --- a/security/py-pass-audit/Makefile +++ b/security/py-pass-audit/Makefile @@ -1,5 +1,6 @@ PORTNAME= pass-audit PORTVERSION= 1.2 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://github.com/roddhjav/${PORTNAME}/releases/download/v${PORTVERSION}/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -26,6 +27,7 @@ NO_BUILD= yes SHEBANG_FILES= ${WRKSRC}/pass_audit/__main__.py post-patch: + @${REINPLACE_CMD} -e 's:%%PREFIX%%:${PREFIX}:g' ${WRKSRC}/setup.py @${REINPLACE_CMD} -e 's:\<python3\>:${PYTHON_CMD}:g' ${WRKSRC}/audit.bash .include <bsd.port.mk> diff --git a/security/py-pass-audit/files/patch-setup.py b/security/py-pass-audit/files/patch-setup.py index fa83e997b80e..cc10eff9ef5b 100644 --- a/security/py-pass-audit/files/patch-setup.py +++ b/security/py-pass-audit/files/patch-setup.py @@ -1,16 +1,18 @@ ---- setup.py.orig 2023-12-04 19:45:19 UTC +--- setup.py.orig 2022-01-30 14:55:34 UTC +++ setup.py -@@ -10,9 +10,12 @@ base = '/usr' +@@ -10,9 +10,13 @@ base = '/usr' share = Path(sys.prefix, 'share') base = '/usr' -if os.uname().sysname == 'Darwin': +- base = '/usr/local' +if os.uname().sysname == 'Darwin' or os.uname().sysname == 'FreeBSD': - base = '/usr/local' ++ base = '%%PREFIX%%' + lib = Path(base, 'lib', 'password-store', 'extensions') +if os.uname().sysname == 'FreeBSD': + lib = Path(base, 'libexec', 'password-store', 'extensions') ++ share = Path(base, 'share') if '--user' in sys.argv: if 'PASSWORD_STORE_EXTENSIONS_DIR' in os.environ:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202312061236.3B6Ca5TA033114>