Received: by mail.netbsd.org (Postfix, from userid 605) id DA85484E9C; Fri, 28 Oct 2022 13:07:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1718884E72 for ; Fri, 28 Oct 2022 13:07:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id wWSwQdtDKLSI for ; Fri, 28 Oct 2022 13:07:22 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 66EEA84D74 for ; Fri, 28 Oct 2022 13:07:22 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 0DAA3FA90; Fri, 28 Oct 2022 13:07:22 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1666962442298590" MIME-Version: 1.0 Date: Fri, 28 Oct 2022 13:07:22 +0000 From: "Greg Troxel" Subject: CVS commit: pkgsrc/chat/matrix-synapse To: pkgsrc-changes@NetBSD.org Reply-To: gdt@netbsd.org X-Mailer: log_accum Message-Id: <20221028130722.0DAA3FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1666962442298590 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gdt Date: Fri Oct 28 13:07:21 UTC 2022 Modified Files: pkgsrc/chat/matrix-synapse: Makefile PLIST Removed Files: pkgsrc/chat/matrix-synapse: MESSAGE Log Message: chat/matrix-synapse: MESSAGE exorcism This had MESSAGE to given an example config generation command (which probably follows upstream docs), and to warn about the deficient sqlite in NetBSD base. Move them to files/ and install as documentation. Add a caution to the Makefile near the sqlite include. (It remains to actually fix the sqlite issue.) To generate a diff of this commit: cvs rdiff -u -r1.3 -r0 pkgsrc/chat/matrix-synapse/MESSAGE cvs rdiff -u -r1.62 -r1.63 pkgsrc/chat/matrix-synapse/Makefile cvs rdiff -u -r1.32 -r1.33 pkgsrc/chat/matrix-synapse/PLIST Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1666962442298590 Content-Disposition: inline Content-Length: 2951 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/chat/matrix-synapse/Makefile diff -u pkgsrc/chat/matrix-synapse/Makefile:1.62 pkgsrc/chat/matrix-synapse/Makefile:1.63 --- pkgsrc/chat/matrix-synapse/Makefile:1.62 Wed Oct 19 14:25:18 2022 +++ pkgsrc/chat/matrix-synapse/Makefile Fri Oct 28 13:07:21 2022 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.62 2022/10/19 14:25:18 nia Exp $ +# $NetBSD: Makefile,v 1.63 2022/10/28 13:07:21 gdt Exp $ DISTNAME= matrix-synapse-1.67.0 +PKGREVISION= 1 CATEGORIES= chat MASTER_SITES= ${MASTER_SITE_GITHUB:=matrix-org/} GITHUB_PROJECT= synapse @@ -42,6 +43,8 @@ DEPENDS+= ${PYPKGPREFIX}-psycopg2>=2.7:. DEPENDS+= ${PYPKGPREFIX}-service_identity>=18.1.0:../../security/py-service_identity DEPENDS+= ${PYPKGPREFIX}-signedjson>=1.1.0:../../security/py-signedjson DEPENDS+= ${PYPKGPREFIX}-sortedcontainers>=1.4.4:../../devel/py-sortedcontainers +# NB: synapse needs features missing in NetBSD base system sqlite, and probably +# missing in other builds. DEPENDS+= ${PYPKGPREFIX}-sqlite3>=0:../../databases/py-sqlite3 DEPENDS+= ${PYPKGPREFIX}-treq>=15.1:../../devel/py-treq DEPENDS+= ${PYPKGPREFIX}-twisted>=18.9.0:../../net/py-twisted @@ -62,11 +65,14 @@ REPLACE_PYTHON+= synapse/_scripts/*.py USE_TOOLS+= perl:run REPLACE_PERL+= scripts/sync_room_to_group.pl -PKG_SYSCONFSUBDIR= matrix-synapse +# Avoid the pyNN- prefix in config, doc, and so on. +HUMAN_PKGNAME= matrix-synapse +PKG_SYSCONFSUBDIR= ${HUMAN_PKGNAME} +DOCDIR= ${PREFIX}/share/doc/${HUMAN_PKGNAME} SYNAPSE_USER?= synapse SYNAPSE_GROUP?= ${SYNAPSE_USER} -SYNAPSE_DATA?= ${VARBASE}/db/matrix-synapse +SYNAPSE_DATA?= ${VARBASE}/db/${HUMAN_PKGNAME} BUILD_DEFS+= SYNAPSE_USER SYNAPSE_GROUP SYNAPSE_DATA VARBASE OWN_DIRS_PERMS+= ${SYNAPSE_DATA} ${SYNAPSE_USER} ${SYNAPSE_GROUP} 0770 @@ -99,6 +105,11 @@ post-patch: # Otherwise, this file is installed and pollutes PLIST. rm ${WRKSRC}/synapse/handlers/room.py.orig +post-install: + ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR} + ${INSTALL_DATA} files/README.pkgsrc.txt ${DESTDIR}${DOCDIR} + ${INSTALL_DATA} files/README.pkgsrc.NetBSD.txt ${DESTDIR}${DOCDIR} + # \todo Grok upstream's new test scheme and port to it. # test status as of 1.51.0 # 51 warnings, 1 error Index: pkgsrc/chat/matrix-synapse/PLIST diff -u pkgsrc/chat/matrix-synapse/PLIST:1.32 pkgsrc/chat/matrix-synapse/PLIST:1.33 --- pkgsrc/chat/matrix-synapse/PLIST:1.32 Thu Oct 6 13:57:53 2022 +++ pkgsrc/chat/matrix-synapse/PLIST Fri Oct 28 13:07:21 2022 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.32 2022/10/06 13:57:53 gdt Exp $ +@comment $NetBSD: PLIST,v 1.33 2022/10/28 13:07:21 gdt Exp $ bin/export_signing_key bin/generate_config bin/generate_log_config @@ -1389,3 +1389,5 @@ ${PYSITELIB}/synapse/util/wheel_timer.py ${PYSITELIB}/synapse/util/wheel_timer.pyc ${PYSITELIB}/synapse/visibility.py ${PYSITELIB}/synapse/visibility.pyc +share/doc/matrix-synapse/README.pkgsrc.txt +share/doc/matrix-synapse/README.pkgsrc.NetBSD.txt --_----------=_1666962442298590--