Received: by mail.netbsd.org (Postfix, from userid 605) id 8550D84EAE; Sat, 21 May 2022 23:02:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id BD68284EA9 for ; Sat, 21 May 2022 23:02:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 8aGrA-T3njUk for ; Sat, 21 May 2022 23:02:48 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2975684CEA for ; Sat, 21 May 2022 23:02:48 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 14F30FAEB; Sat, 21 May 2022 23:03:31 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1653174211203920" MIME-Version: 1.0 Date: Sat, 21 May 2022 23:03:31 +0000 From: "Roland Illig" Subject: CVS commit: pkgsrc/www/mediawiki To: pkgsrc-changes@NetBSD.org Reply-To: rillig@netbsd.org X-Mailer: log_accum Message-Id: <20220521230331.14F30FAEB@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1653174211203920 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rillig Date: Sat May 21 23:03:31 UTC 2022 Modified Files: pkgsrc/www/mediawiki: Makefile Log Message: mediawiki: remove noop SUBST blocks These blocks have been ignored since 2018-07-04, when the SUBST_STAGE was changed from post-patch to pre-configure. Replacing "NO_CONFIGURE=yes" with "do-configure: # nothing" demonstrated that these SUBST blocks were outdated anyway, at least one of them referred to missing files. To generate a diff of this commit: cvs rdiff -u -r1.86 -r1.87 pkgsrc/www/mediawiki/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1653174211203920 Content-Disposition: inline Content-Length: 2140 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/mediawiki/Makefile diff -u pkgsrc/www/mediawiki/Makefile:1.86 pkgsrc/www/mediawiki/Makefile:1.87 --- pkgsrc/www/mediawiki/Makefile:1.86 Sat Oct 2 01:52:48 2021 +++ pkgsrc/www/mediawiki/Makefile Sat May 21 23:03:30 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.86 2021/10/02 01:52:48 wen Exp $ +# $NetBSD: Makefile,v 1.87 2022/05/21 23:03:30 rillig Exp $ DISTNAME= mediawiki-${VER}.${PVER} CATEGORIES= www @@ -36,47 +36,6 @@ CONF_FILES= ${PREFIX}/${EGDIR}/mediawik NO_CONFIGURE= YES NO_BUILD= YES -SUBST_CLASSES+= paths -SUBST_MESSAGE.paths= Fixing pathnames in configuration file. -SUBST_STAGE.paths= pre-configure -SUBST_FILES.paths= ../mediawiki.conf -SUBST_VARS.paths= MEDIAWIKI - -SUBST_CLASSES+= sh -SUBST_STAGE.sh= pre-configure -SUBST_MESSAGE.sh= Fixing path to sh -SUBST_FILES.sh+= maintenance/storage/make-blobs -SUBST_FILES.sh+= maintenance/dev/install.sh maintenance/dev/installphp.sh -SUBST_FILES.sh+= maintenance/dev/installmw.sh maintenance/dev/start.sh -SUBST_FILES.sh+= includes/limit.sh -SUBST_SED.sh= -e "s|/bin/bash|${SH}|" - -SUBST_CLASSES+= sh2 -SUBST_STAGE.sh2= pre-configure -SUBST_MESSAGE.sh2= Fixing path to sh -SUBST_FILES.sh2+= maintenance/mwjsduck-gen -SUBST_FILES.sh2+= docs/kss/scripts/kss-node-check.sh -SUBST_SED.sh2= -e "s|/usr/bin/env bash|${SH}|" - -SUBST_CLASSES+= perl -SUBST_STAGE.perl= pre-configure -SUBST_MESSAGE.perl= Fixing path to perl -SUBST_FILES.perl+= maintenance/postgres/compare_schemas.pl -SUBST_FILES.perl+= maintenance/postgres/mediawiki_mysql2postgres.pl -SUBST_SED.perl= -e "s|/usr/bin/perl|${PERL5}|" - -SUBST_CLASSES+= python -SUBST_STAGE.python= pre-configure -SUBST_MESSAGE.python= Fixing python path -SUBST_FILES.python+= extensions/ConfirmEdit/captcha.py -SUBST_SED.python= -e "s,/usr/bin/python,${PYTHONBIN}," - -SUBST_CLASSES+= python2 -SUBST_STAGE.python2= pre-configure -SUBST_MESSAGE.python2= Fixing python path -SUBST_FILES.python2+= maintenance/language/zhtable/Makefile.py -SUBST_SED.python2= -e "s,/usr/bin/env python,${PYTHONBIN}," - post-extract: ${CP} ${FILESDIR}/mediawiki.conf ${WRKDIR}/mediawiki.conf --_----------=_1653174211203920--