CVS commit: pkgsrc/chat

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Tue Aug 26 18:35:51 UTC 2025

Modified Files:
        pkgsrc/chat/jicofo: Makefile
        pkgsrc/chat/jitsi-meet: Makefile.common
        pkgsrc/chat/jitsi-videobridge: Makefile
Added Files:
        pkgsrc/chat/jitsi-meet-prosody: distinfo
Removed Files:
        pkgsrc/chat/jitsi-meet: distinfo

Log Message:
chat/jitsi-meet*: Reduce Makefile.common

jitsi-meet/Makefile.common used to set DISTINFO, but most users
overrode it, and the common package has no distinfo, being not
buildable.

Further, jicofo has a distfile of the same name, but different
contents.

Stop using DIST_SUBDIR for users of the main tarball, avoiding
duplicate copies.  Keep it for jicofo, and make the reason for doing
so clearer.

NFCI.

Conceptual ok khorben@ ktnb@.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/chat/jicofo/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/chat/jitsi-meet/Makefile.common
cvs rdiff -u -r1.3 -r0 pkgsrc/chat/jitsi-meet/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/chat/jitsi-meet-prosody/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/chat/jitsi-videobridge/Makefile

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

Modified files:

Index: pkgsrc/chat/jicofo/Makefile
diff -u pkgsrc/chat/jicofo/Makefile:1.2 pkgsrc/chat/jicofo/Makefile:1.3
--- pkgsrc/chat/jicofo/Makefile:1.2     Mon Aug 25 15:45:08 2025
+++ pkgsrc/chat/jicofo/Makefile Tue Aug 26 18:35:50 2025
@@ -1,5 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2025/08/25 15:45:08 ktnb Exp $
+# $NetBSD: Makefile,v 1.3 2025/08/26 18:35:50 gdt Exp $
 
+# Despite using chat/jitsi-meet/Makefile.common, this package uses a
+# different distfile.  Confusingly, it has the same name as the
+# jitsi-meet distfile.  Thus DIST_SUBDIR is set below.
 .include "../../chat/jitsi-meet/Makefile.common"
 
 GITHUB_PROJECT=        jicofo
@@ -8,7 +11,7 @@ PKGNAME=       ${GITHUB_PROJECT}-${JITSI_MEET_
 HOMEPAGE=      https://github.com/jitsi/jicofo/
 COMMENT=       Server-side focus component used in Jitsi Meet conferences
 
-DISTINFO_FILE= ${.CURDIR}/../../chat/jicofo/distinfo
+DIST_SUBDIR=   jicofo
 DISTFILES=     ${DEFAULT_DISTFILES}
 DISTFILES+=    jicofo-java-deps-${JITSI_MEET_VERSION}.tar.gz
 SITES.jicofo-java-deps-${JITSI_MEET_VERSION}.tar.gz= \

Index: pkgsrc/chat/jitsi-meet/Makefile.common
diff -u pkgsrc/chat/jitsi-meet/Makefile.common:1.4 pkgsrc/chat/jitsi-meet/Makefile.common:1.5
--- pkgsrc/chat/jitsi-meet/Makefile.common:1.4  Mon Aug 25 15:45:08 2025
+++ pkgsrc/chat/jitsi-meet/Makefile.common      Tue Aug 26 18:35:50 2025
@@ -1,14 +1,27 @@
-# $NetBSD: Makefile.common,v 1.4 2025/08/25 15:45:08 ktnb Exp $
+# $NetBSD: Makefile.common,v 1.5 2025/08/26 18:35:50 gdt Exp $
 # used by chat/jicofo/Makefile
 # used by chat/jitsi-meet-prosody/Makefile
 # used by chat/jitsi-videobridge/Makefile
+# used by wip/jitsi-meet
+
+# This makefile is used by packages that use tarballs from the
+# jitsi-meet project with the name jitsi-meet_$version.  As expected,
+# this includes multiple packages that use the tarball distributed
+# from the jitsi-meet repository.
+#
+# Not expected, it includes jicofo, which uses a tarball distributed
+# under the jicofo repository, which has the same name but different
+#  contents.
+#
+# \todo Separate same-tarball from same-project content into separate
+# include files, to avoid confusing use of ?= and overrides, in favor
+# of just setting what should be set.
 
 GITHUB_PROJECT?=       jitsi-meet
 GITHUB_TAG?=           stable/jitsi-meet_10431
 DISTNAME?=             jitsi-meet_10431
 CATEGORIES=            chat
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=jitsi/}
-DIST_SUBDIR=           ${GITHUB_PROJECT}
 JITSI_MEET_VERSION=    2.0.10431
 
 MAINTAINER=            khorben%defora.org@localhost
@@ -17,5 +30,3 @@ COMMENT?=             Secure, Simple and Scalable V
 LICENSE=               apache-2.0
 
 WRKSRC?=               ${WRKDIR}/${GITHUB_PROJECT}-stable-${DISTNAME}
-
-DISTINFO_FILE?=                ${.CURDIR}/../../chat/jitsi-meet/distinfo

Index: pkgsrc/chat/jitsi-videobridge/Makefile
diff -u pkgsrc/chat/jitsi-videobridge/Makefile:1.4 pkgsrc/chat/jitsi-videobridge/Makefile:1.5
--- pkgsrc/chat/jitsi-videobridge/Makefile:1.4  Tue Aug 26 12:13:32 2025
+++ pkgsrc/chat/jitsi-videobridge/Makefile      Tue Aug 26 18:35:50 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2025/08/26 12:13:32 gdt Exp $
+# $NetBSD: Makefile,v 1.5 2025/08/26 18:35:50 gdt Exp $
 
 .include "../../chat/jitsi-meet/Makefile.common"
 
@@ -8,7 +8,6 @@ PKGNAME=        ${GITHUB_PROJECT}-${JITSI_MEET_
 HOMEPAGE=      https://github.com/jitsi/jitsi-videobridge/
 COMMENT=       WebRTC compatible video router or SFU
 
-DISTINFO_FILE= ${.CURDIR}/../../chat/jitsi-videobridge/distinfo
 DISTFILES=     ${DEFAULT_DISTFILES}
 DISTFILES+=    jitsi-videobridge-java-deps-${JITSI_MEET_VERSION}.tar.gz
 SITES.jitsi-videobridge-java-deps-${JITSI_MEET_VERSION}.tar.gz= \

Added files:

Index: pkgsrc/chat/jitsi-meet-prosody/distinfo
diff -u /dev/null pkgsrc/chat/jitsi-meet-prosody/distinfo:1.1
--- /dev/null   Tue Aug 26 18:35:51 2025
+++ pkgsrc/chat/jitsi-meet-prosody/distinfo     Tue Aug 26 18:35:50 2025
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2025/08/26 18:35:50 gdt Exp $
+
+BLAKE2s (jitsi-meet_10431.tar.gz) = c6338a5a7272a8233e1214755d898d837e2c692de0cad50a24e35523761f3166
+SHA512 (jitsi-meet_10431.tar.gz) = 6c5ec5a3948d10ac2f7c410f0c26e492ee242cea6fb09572447e1bcad1ad96bca61bbff0b903f3955b88f19dae84d78471adcee6c67d83f7b75e3153899c7b70
+Size (jitsi-meet_10431.tar.gz) = 138781488 bytes