pkgsrc-WIP-changes archive

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

jitsi-{meet,meet-prosody,videobridge}: share more common variables



Module Name:	pkgsrc-wip
Committed By:	Pierre Pronchery <khorben%defora.org@localhost>
Pushed By:	khorben
Date:		Sat Nov 21 05:52:22 2020 +0100
Changeset:	a57a2876cf9f4f1754e4d3b61b3b08177ffb2357

Modified Files:
	jitsi-meet/Makefile
	jitsi-meet/Makefile.common
	jitsi-videobridge/Makefile

Log Message:
jitsi-{meet,meet-prosody,videobridge}: share more common variables

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

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

diffstat:
 jitsi-meet/Makefile        |  2 --
 jitsi-meet/Makefile.common |  8 +++++---
 jitsi-videobridge/Makefile | 15 +++++----------
 3 files changed, 10 insertions(+), 15 deletions(-)

diffs:
diff --git a/jitsi-meet/Makefile b/jitsi-meet/Makefile
index 7bbc5975f1..9174307a53 100644
--- a/jitsi-meet/Makefile
+++ b/jitsi-meet/Makefile
@@ -2,8 +2,6 @@
 
 PKGNAME=	${GITHUB_PROJECT}-${JITSI_MEET_VERSION}
 
-COMMENT=	Secure, Simple and Scalable Video Conferences
-
 USE_TOOLS=	gmake tar
 
 BUILD_DEPENDS+=	npm-[0-9]*:../../lang/npm
diff --git a/jitsi-meet/Makefile.common b/jitsi-meet/Makefile.common
index b932214283..23949b883f 100644
--- a/jitsi-meet/Makefile.common
+++ b/jitsi-meet/Makefile.common
@@ -1,8 +1,9 @@
 # $NetBSD$
 # used by wip/jitsi-meet/Makefile
 # used by wip/jitsi-meet-prosody/Makefile
+# used by wip/jitsi-videobridge/Makefile
 
-GITHUB_PROJECT=	jitsi-meet
+GITHUB_PROJECT?=jitsi-meet
 GITHUB_TAG=	stable/jitsi-meet_5142
 DISTNAME=	jitsi-meet_5142
 CATEGORIES=	chat
@@ -11,9 +12,10 @@ DIST_SUBDIR=	${GITHUB_PROJECT}
 JITSI_MEET_VERSION=	2.0.5142
 
 MAINTAINER=	khorben%defora.org@localhost
-HOMEPAGE=	https://github.com/jitsi/jitsi-meet/
+HOMEPAGE?=	https://github.com/jitsi/jitsi-meet/
+COMMENT?=	Secure, Simple and Scalable Video Conferences
 LICENSE=	apache-2.0
 
 WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-stable-${DISTNAME}
 
-DISTINFO_FILE=	${.CURDIR}/../../wip/jitsi-meet/distinfo
+DISTINFO_FILE?=	${.CURDIR}/../../wip/jitsi-meet/distinfo
diff --git a/jitsi-videobridge/Makefile b/jitsi-videobridge/Makefile
index a52c621ca6..09d56285f9 100644
--- a/jitsi-videobridge/Makefile
+++ b/jitsi-videobridge/Makefile
@@ -1,19 +1,13 @@
 # $NetBSD$
 
 GITHUB_PROJECT=	jitsi-videobridge
-GITHUB_TAG=	stable/jitsi-meet_5142
-DISTNAME=	jitsi-meet_5142
-PKGNAME=	${GITHUB_PROJECT}-2.0.5142
-CATEGORIES=	chat
-MASTER_SITES=	${MASTER_SITE_GITHUB:=jitsi/}
-DIST_SUBDIR=	${GITHUB_PROJECT}
-
-MAINTAINER=	khorben%defora.org@localhost
+PKGNAME=	${GITHUB_PROJECT}-${JITSI_MEET_VERSION}
+
 HOMEPAGE=	https://github.com/jitsi/jitsi-videobridge/
 COMMENT=	WebRTC compatible video router or SFU
-LICENSE=	apache-2.0
 
-WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-stable-${DISTNAME}
+DISTINFO_FILE=	${.CURDIR}/../../wip/jitsi-videobridge/distinfo
+
 USE_TOOLS=	bash:run unzip
 USE_JAVA2=	8
 
@@ -55,5 +49,6 @@ do-install:
 	${LN} -s ../share/jitsi-videobridge/jvb.sh \
 		${DESTDIR}${PREFIX}/bin/jvb
 
+.include "../../wip/jitsi-meet/Makefile.common"
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"


Home | Main Index | Thread Index | Old Index