pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

aerc: fixed interpreter error



Module Name:	pkgsrc-wip
Committed By:	Kevin Bloom <kevin.bloom%posteo.net@localhost>
Pushed By:	nuclearkev
Date:		Mon Dec 18 08:53:52 2023 -0500
Changeset:	3c4cc4f8eb0502f54ec7ef102b381d7dc1bfeb59

Modified Files:
	aerc/Makefile
	aerc/TODO
	aerc/distinfo
Added Files:
	aerc/patches/patch-GNUmakefile

Log Message:
aerc: fixed interpreter error

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3c4cc4f8eb0502f54ec7ef102b381d7dc1bfeb59

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 aerc/Makefile                  | 10 +++++-----
 aerc/TODO                      |  2 +-
 aerc/distinfo                  |  1 +
 aerc/patches/patch-GNUmakefile | 13 +++++++++++++
 4 files changed, 20 insertions(+), 6 deletions(-)

diffs:
diff --git a/aerc/Makefile b/aerc/Makefile
index 438784777b..4087c762a7 100644
--- a/aerc/Makefile
+++ b/aerc/Makefile
@@ -18,10 +18,10 @@ USE_LANGUAGES=	c go
 TOOL_DEPENDS+=	go118>=1.18.0:../../lang/go118
 TOOL_DEPENDS+=	scdoc:../../textproc/scdoc
 
-REPLACE_INTERPRETER+=	env
-REPLACE.env.old=	.*/bin/env
-REPLACE.env.new=	${PREFIX}/bin/env
-REPLACE_FILES.env=	contrib/carddav-query
-REPLACE_FILES.env=	filters/show-ics-details.py
+REPLACE_INTERPRETER+=	python
+REPLACE.python.old=	.*/usr/bin/env python3
+REPLACE.python.new=	${PREFIX}/bin/python3.11
+REPLACE_FILES.python+=	contrib/carddav-query
+REPLACE_FILES.python+=	filters/show-ics-details.py
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/aerc/TODO b/aerc/TODO
index 4ae6d21c5a..e6d901630a 100644
--- a/aerc/TODO
+++ b/aerc/TODO
@@ -1,3 +1,3 @@
-fix interpreter errors
+PIE intalling error
 testing
 commit_msg
diff --git a/aerc/distinfo b/aerc/distinfo
index aec026bde8..821b67621a 100644
--- a/aerc/distinfo
+++ b/aerc/distinfo
@@ -3,3 +3,4 @@ $NetBSD$
 BLAKE2s (0.16.0.tar.gz) = 539121352a852bbde5181815dd85e9672ef3e6fefe50ebc2a3c9a571409a94d6
 SHA512 (0.16.0.tar.gz) = 8196424915f8f6dc80bad0f936e34b7f51298665af3579ae8c06699a4f1caf962258185a432909911920ec1eb089c9f178c9086c54c0e799a44e1e0dac907fd8
 Size (0.16.0.tar.gz) = 387833 bytes
+SHA1 (patch-GNUmakefile) = 1879a0effd84bf7e19843c6a641426dd3da25881
diff --git a/aerc/patches/patch-GNUmakefile b/aerc/patches/patch-GNUmakefile
new file mode 100644
index 0000000000..f1a1b236ed
--- /dev/null
+++ b/aerc/patches/patch-GNUmakefile
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- GNUmakefile.orig	2023-12-18 12:58:29.074685927 +0000
++++ GNUmakefile
+@@ -6,7 +6,7 @@ BINDIR ?= $(PREFIX)/bin
+ SHAREDIR ?= $(PREFIX)/share/aerc
+ LIBEXECDIR ?= $(PREFIX)/libexec/aerc
+ MANDIR ?= $(PREFIX)/share/man
+-GO ?= go
++GO ?= go118
+ GOFLAGS ?= $(shell contrib/goflags.sh)
+ BUILD_OPTS ?= -trimpath
+ GO_LDFLAGS :=


Home | Main Index | Thread Index | Old Index