emacspeak: fix use of /usr/bin/env in shebangs and references to build directory.

[adr <adr%sdf.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	adr <adr%sdf.org@localhost>
Pushed By:	adr
Date:		Tue Mar 12 23:44:14 2024 +0000
Changeset:	a0f52e24a34710d33dbfbdb466763f71d074e4a4

Modified Files:
	emacspeak/MESSAGE
	emacspeak/Makefile
	emacspeak/distinfo
Added Files:
	emacspeak/patches/patch-lisp_emacspeak-bookshare.el

Log Message:
emacspeak: fix use of /usr/bin/env in shebangs and references to build directory.

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

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

diffstat:
 emacspeak/MESSAGE                                   |  4 ++--
 emacspeak/Makefile                                  |  9 +++++----
 emacspeak/distinfo                                  |  1 +
 emacspeak/patches/patch-lisp_emacspeak-bookshare.el | 15 +++++++++++++++
 4 files changed, 23 insertions(+), 6 deletions(-)

diffs:
diff --git a/emacspeak/MESSAGE b/emacspeak/MESSAGE
index 2614232796..8606a94495 100644
--- a/emacspeak/MESSAGE
+++ b/emacspeak/MESSAGE
@@ -1,10 +1,10 @@
 ===========================================================================
 $NetBSD$
 Add (load-library "emacspeak-setup.el") at the beginning of your
-.emacs to activate emacspeak in every Emacs execution, or use the -l
+.emacs to activate Emacspeak in every Emacs execution, or use the -l
 option when executing Emacs.
 
 If you can't hear the auditory icons and other sound effects, set the
-emacs variable emacspeak-play-program and the environment variable
+Emacs variable emacspeak-play-program and the environment variable
 EMACSPEAK_PLAY to the path of your audio player of choice.
 ===========================================================================
diff --git a/emacspeak/Makefile b/emacspeak/Makefile
index 8045efc136..9a7650f354 100644
--- a/emacspeak/Makefile
+++ b/emacspeak/Makefile
@@ -26,12 +26,13 @@ SUBST_MESSAGE.fix-tclsh=	Fixing tclsh path
 SUBST_FILES.fix-tclsh=		servers/*
 SUBST_SED.fix-tclsh=		-e 's,/usr/bin/tclsh,${PREFIX}/bin/tclsh,'
 
-# Just for mac...
+# Fix use of /usr/bin/env
 SUBST_CLASSES+=			fix-python
 SUBST_STAGE.fix-python=		pre-configure
 SUBST_MESSAGE.fix-python=	Fixing dynamic python
-SUBST_FILES.fix-python=		servers/mac
-SUBST_SED.fix-python=		-e 's,/usr/bin/env python,${PYTHONBIN},'
+SUBST_FILES.fix-python=		etc/*streamtheworld.py
+SUBST_FILES.fix-python+=	servers/mac
+SUBST_SED.fix-python=		-e 's,/usr/bin/env python.*,${PYTHONBIN},'
 
 # Fix sox path
 SUBST_CLASSES+=			fix-sox-path
@@ -58,6 +59,7 @@ post-build:
 		${CHMOD} 644 "$$i"; \
 	done; \
 	for i in 	servers/native-espeak/Makefile.orig \
+			lisp/emacspeak-bookshare.el.orig \
 			servers/tts-lib.tcl.orig; do \
 		rm "$$i"; \
 	done
@@ -73,6 +75,5 @@ do-install:
 .include "../../audio/espeak-ng/buildlink3.mk"
 .include "../../audio/sox/buildlink3.mk"
 .include "../../editors/emacs/modules.mk"
-# Just for mac...
 .include "../../lang/python/tool.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emacspeak/distinfo b/emacspeak/distinfo
index e8eac950fa..16485a1d2f 100644
--- a/emacspeak/distinfo
+++ b/emacspeak/distinfo
@@ -3,5 +3,6 @@ $NetBSD$
 BLAKE2s (emacspeak-59.0.tar.bz2) = 1c82c51457e2b77215ae872def4fdc52318e0b701ac937a3c7bc0afb386341c5
 SHA512 (emacspeak-59.0.tar.bz2) = 42dda7d09df43611081b9ddaadd23db09bd619439d6d9a9b034f8cf87a93f51d29dc6f878e2dd4434ac6f84dade1e6516b042378521f701c58eeaa5d9719592e
 Size (emacspeak-59.0.tar.bz2) = 7984386 bytes
+SHA1 (patch-lisp_emacspeak-bookshare.el) = 12778e71cc620d0ca7668b2c1f2cd204c05a4bd3
 SHA1 (patch-servers_native-espeak_Makefile) = 12e8485b79f8c008ae83bc29ef094d29d2efdd85
 SHA1 (patch-servers_tts-lib.tcl) = 5307ec48cb0d5d13afe8b0a21a2545cb7fda743a
diff --git a/emacspeak/patches/patch-lisp_emacspeak-bookshare.el b/emacspeak/patches/patch-lisp_emacspeak-bookshare.el
new file mode 100644
index 0000000000..4608e674cf
--- /dev/null
+++ b/emacspeak/patches/patch-lisp_emacspeak-bookshare.el
@@ -0,0 +1,15 @@
+$NetBSD$
+
+* Fix references to the build directory.
+
+--- lisp/emacspeak-bookshare.el.orig	2022-04-18 20:56:41.000000000 +0000
++++ lisp/emacspeak-bookshare.el
+@@ -115,7 +115,7 @@ See http://developer.bookshare.org/docs 
+   "Bookshare user Id.")
+ 
+ (defcustom emacspeak-bookshare-directory
+-  (eval-when-compile (expand-file-name "~/books/book-share"))
++  (file-name-as-directory "~/books/book-share")
+   "Customize this to the root of where books are organized."
+   :type 'directory
+   :group 'emacspeak-bookshare)