Received: by mail.netbsd.org (Postfix, from userid 605) id 6F8A684DBF; Thu, 29 Jun 2017 19:37:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id F261F84DB1 for ; Thu, 29 Jun 2017 19:37:26 +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 ZY_SUEE22Xd4 for ; Thu, 29 Jun 2017 19:37:26 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 5D9A784D72 for ; Thu, 29 Jun 2017 19:37:26 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 57F33FAE8; Thu, 29 Jun 2017 19:37:26 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_149876504645060" MIME-Version: 1.0 Date: Thu, 29 Jun 2017 19:37:26 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/editors/pluma To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20170629193726.57F33FAE8@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. --_----------=_149876504645060 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Thu Jun 29 19:37:26 UTC 2017 Modified Files: pkgsrc/editors/pluma: options.mk Log Message: More python fallout, we need to specifically override PYTHONBIN and ensure python2.7 is used during the build process, even though it is incompatible, because the scripts are not python3 compatible. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 pkgsrc/editors/pluma/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_149876504645060 Content-Disposition: inline Content-Length: 863 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/editors/pluma/options.mk diff -u pkgsrc/editors/pluma/options.mk:1.4 pkgsrc/editors/pluma/options.mk:1.5 --- pkgsrc/editors/pluma/options.mk:1.4 Wed Jun 28 15:56:22 2017 +++ pkgsrc/editors/pluma/options.mk Thu Jun 29 19:37:26 2017 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2017/06/28 15:56:22 jperkin Exp $ +# $NetBSD: options.mk,v 1.5 2017/06/29 19:37:26 jperkin Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.pluma PKG_SUPPORTED_OPTIONS= enchant @@ -33,4 +33,8 @@ PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # .include "../../x11/py-gtksourceview/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-python +# XXX: Due to the mess described above, and the fact that python is required +# by the build process but is not python3 compatible, we need to override and +# use python2.7 explicitly. +PYTHONBIN= ${LOCALBASE}/bin/python2.7 .endif --_----------=_149876504645060--