Received: by mail.netbsd.org (Postfix, from userid 605) id 7D3EF84D5B; Wed, 22 Apr 2020 16:16:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 04E0384D58 for ; Wed, 22 Apr 2020 16:16:13 +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 d7XmDnGLFXxy for ; Wed, 22 Apr 2020 16:16:12 +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 58D0284CE3 for ; Wed, 22 Apr 2020 16:16:12 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 52833FB27; Wed, 22 Apr 2020 16:16:12 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1587572172137660" MIME-Version: 1.0 Date: Wed, 22 Apr 2020 16:16:12 +0000 From: "Leonardo Taccari" Subject: CVS commit: pkgsrc/chat/weechat To: pkgsrc-changes@NetBSD.org Reply-To: leot@netbsd.org X-Mailer: log_accum Message-Id: <20200422161612.52833FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1587572172137660 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: leot Date: Wed Apr 22 16:16:12 UTC 2020 Modified Files: pkgsrc/chat/weechat: Makefile Log Message: weechat: Use SUBST framework to adjust hardcoded pkg-config python checks The previous ${LN} incantation missed possible python3-embed.pc file (present in python38) ending up in a not-working python support. Do not adjust file under ${BUILDLINK_DIR} and use the SUBST framework to adjust all python3 pkg-config invocations. To generate a diff of this commit: cvs rdiff -u -r1.113 -r1.114 pkgsrc/chat/weechat/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1587572172137660 Content-Disposition: inline Content-Length: 986 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/chat/weechat/Makefile diff -u pkgsrc/chat/weechat/Makefile:1.113 pkgsrc/chat/weechat/Makefile:1.114 --- pkgsrc/chat/weechat/Makefile:1.113 Mon Mar 30 11:07:18 2020 +++ pkgsrc/chat/weechat/Makefile Wed Apr 22 16:16:12 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.113 2020/03/30 11:07:18 nia Exp $ +# $NetBSD: Makefile,v 1.114 2020/04/22 16:16:12 leot Exp $ DISTNAME= weechat-2.8 CATEGORIES= chat @@ -37,10 +37,12 @@ BUILDLINK_TRANSFORM+= rm:-Werror-implici .include "options.mk" -pre-configure: .if !empty(PKG_OPTIONS:Mpython) - ${LN} -sf ${BUILDLINK_DIR}/lib/pkgconfig/python-${PYVERSSUFFIX}.pc \ - ${BUILDLINK_DIR}/lib/pkgconfig/python3.pc +SUBST_CLASSES+= python +SUBST_STAGE.python= pre-configure +SUBST_MESSAGE.python= Adjust pkg-config python checks +SUBST_FILES.python= configure.ac cmake/FindPython.cmake +SUBST_SED.python= -e 's,python3,python-${PYVERSSUFFIX},g' .endif .include "../../graphics/hicolor-icon-theme/buildlink3.mk" --_----------=_1587572172137660--