ji{cofo,tsi-videobridge}: fix the default binaries

[Pierre Pronchery <khorben%defora.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Pierre Pronchery <khorben%defora.org@localhost>
Pushed By:	khorben
Date:		Sat Oct 31 15:38:55 2020 +0100
Changeset:	eab4898e4b08f87f0131ca630fe9a206f93ddadb

Modified Files:
	jicofo/Makefile
	jicofo/distinfo
	jitsi-videobridge/Makefile
	jitsi-videobridge/distinfo
Removed Files:
	jicofo/patches/patch-resources_jicofo.sh
	jitsi-videobridge/patches/patch-jvb_resources_jvb.sh

Log Message:
ji{cofo,tsi-videobridge}: fix the default binaries

Both packages now depend on bash.

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

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

diffstat:
 jicofo/Makefile                                      | 12 +++++++++---
 jicofo/distinfo                                      |  1 -
 jicofo/patches/patch-resources_jicofo.sh             | 15 ---------------
 jitsi-videobridge/Makefile                           | 12 +++++++++---
 jitsi-videobridge/distinfo                           |  1 -
 jitsi-videobridge/patches/patch-jvb_resources_jvb.sh | 15 ---------------
 6 files changed, 18 insertions(+), 38 deletions(-)

diffs:
diff --git a/jicofo/Makefile b/jicofo/Makefile
index 694dee2547..beff527753 100644
--- a/jicofo/Makefile
+++ b/jicofo/Makefile
@@ -13,9 +13,10 @@ COMMENT=	Server side focus component used in Jitsi Meet conferences
 LICENSE=	apache-2.0
 
 WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${DISTNAME}
-USE_TOOLS=	unzip
-USE_JAVA=	yes
-USE_JAVA2=	9
+USE_TOOLS=	bash:run unzip
+USE_JAVA2=	8
+
+REPLACE_BASH=	resources/jicofo.sh
 
 TOOL_DEPENDS+=	apache-maven-[0-9]*:../../devel/apache-maven
 
@@ -27,6 +28,11 @@ MAVEN_FLAGS+=	-Djavax.net.ssl.trustStorePassword=password
 INSTALLATION_DIRS+=	bin
 INSTALLATION_DIRS+=	share
 
+SUBST_CLASSES+=		java
+SUBST_STAGE.java=	post-configure
+SUBST_FILES.java=	resources/jicofo.sh
+SUBST_SED.java=		-e 's,^exec java,exec ${JAVA_BINPREFIX}-java,'
+
 do-configure:
 	#XXX this assumes trusted CA certificates are in /etc/openssl/certs
 	cd ${WRKSRC} && \
diff --git a/jicofo/distinfo b/jicofo/distinfo
index 8e48793e6a..fca50bf83d 100644
--- a/jicofo/distinfo
+++ b/jicofo/distinfo
@@ -4,4 +4,3 @@ SHA1 (jicofo/644.tar.gz) = af3dd273553f6c9956ea42cdad44624efb99848f
 RMD160 (jicofo/644.tar.gz) = c627f480002f81189868117a7ff412513dfebc0b
 SHA512 (jicofo/644.tar.gz) = 77cccfa0ba28e845d04e74a95289344ed08a04b2bdf59d87e9f01801e1222b0446509f491d08e8169595c9fe6f7c0e56494b25c57321c0bc831fdfab018ef27d
 Size (jicofo/644.tar.gz) = 277128 bytes
-SHA1 (patch-resources_jicofo.sh) = a73a0f4c731ec59db72d56f87f562b224bddff7f
diff --git a/jicofo/patches/patch-resources_jicofo.sh b/jicofo/patches/patch-resources_jicofo.sh
deleted file mode 100644
index d297f47f5e..0000000000
--- a/jicofo/patches/patch-resources_jicofo.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Remove requirement on bash.
-
---- resources/jicofo.sh.orig	2020-10-13 17:13:04.000000000 +0000
-+++ resources/jicofo.sh
-@@ -1,6 +1,6 @@
--#!/bin/bash
-+#!/bin/sh
- 
--if [[ "$1" == "--help"  || $# -lt 1 ]]; then
-+if [ "$1" = "--help" -o $# -lt 1 ]; then
-     echo -e "Usage:"
-     echo -e "$0 [OPTIONS], where options can be:"
-     echo -e "\t--host=HOST\t sets the hostname of the XMPP server (default: domain, if domain is set, localhost otherwise)"
diff --git a/jitsi-videobridge/Makefile b/jitsi-videobridge/Makefile
index b0cc919104..a52c621ca6 100644
--- a/jitsi-videobridge/Makefile
+++ b/jitsi-videobridge/Makefile
@@ -14,9 +14,10 @@ COMMENT=	WebRTC compatible video router or SFU
 LICENSE=	apache-2.0
 
 WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-stable-${DISTNAME}
-USE_TOOLS=	unzip
-USE_JAVA=	yes
-USE_JAVA2=	9
+USE_TOOLS=	bash:run unzip
+USE_JAVA2=	8
+
+REPLACE_BASH=	jvb/resources/jvb.sh
 
 TOOL_DEPENDS+=	apache-maven-[0-9]*:../../devel/apache-maven
 
@@ -27,6 +28,11 @@ MAVEN_FLAGS+=	-Djavax.net.ssl.trustStorePassword=password
 INSTALLATION_DIRS+=	bin
 INSTALLATION_DIRS+=	share
 
+SUBST_CLASSES+=		java
+SUBST_STAGE.java=	post-configure
+SUBST_FILES.java=	jvb/resources/jvb.sh
+SUBST_SED.java=		-e 's,^exec java,exec ${JAVA_BINPREFIX}-java,'
+
 do-configure:
 	#XXX this assumes trusted CA certificates are in /etc/openssl/certs
 	cd ${WRKSRC} && \
diff --git a/jitsi-videobridge/distinfo b/jitsi-videobridge/distinfo
index 1fdf086f02..119a6be3f5 100644
--- a/jitsi-videobridge/distinfo
+++ b/jitsi-videobridge/distinfo
@@ -4,4 +4,3 @@ SHA1 (jitsi-videobridge/jitsi-meet_5142.tar.gz) = cded7d680d5a99d295336708070973
 RMD160 (jitsi-videobridge/jitsi-meet_5142.tar.gz) = a9fc7cc9da75097ef654c147179c3f1e374d60bc
 SHA512 (jitsi-videobridge/jitsi-meet_5142.tar.gz) = e8a992c7219d535c21c32f7f99a0c230c8bbe3acf9f1992dfc9bc56c534b17d77226b8dc0f28371f3f6c8b6cdf9dee465eef613859db93dd0580b136f1009e44
 Size (jitsi-videobridge/jitsi-meet_5142.tar.gz) = 282832 bytes
-SHA1 (patch-jvb_resources_jvb.sh) = 125c075bb639dcbfec9a5cf745d95799620cf26f
diff --git a/jitsi-videobridge/patches/patch-jvb_resources_jvb.sh b/jitsi-videobridge/patches/patch-jvb_resources_jvb.sh
deleted file mode 100644
index bf17a14356..0000000000
--- a/jitsi-videobridge/patches/patch-jvb_resources_jvb.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Remove requirement on bash.
-
---- jvb/resources/jvb.sh.orig	2020-10-13 19:37:04.000000000 +0000
-+++ jvb/resources/jvb.sh
-@@ -1,6 +1,6 @@
--#!/bin/bash
-+#!/bin/sh
- 
--if [[ "$1" == "--help"  || $# -lt 1 ]]; then
-+if [ "$1" = "--help" -o $# -lt 1 ]; then
-     echo -e "Usage:"
-     echo -e "$0 [OPTIONS], where options can be:"
-     echo -e "\t--apis=APIS where APIS is a comma separated list of APIs to enable. Currently the only supported API is 'rest'. The default is none."