pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/editors/pluma pluma: explicitly note Python 2.7 tool d...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/46c310dd70b6
branches:  trunk
changeset: 397548:46c310dd70b6
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Sun Jun 30 13:34:40 2019 +0000

description:
pluma: explicitly note Python 2.7 tool dependency

Pluma sets Python 3.x as an application dependency through the standard
means of doing so, but its build tooling is still dependent on 2.7, so
we need both. Add a TOOL_DEPENDS here to fix issues noted in bulk
builds.

diffstat:

 editors/pluma/Makefile   |  3 ++-
 editors/pluma/options.mk |  3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diffs (33 lines):

diff -r 695a2edce559 -r 46c310dd70b6 editors/pluma/Makefile
--- a/editors/pluma/Makefile    Sat Jun 29 22:36:15 2019 +0000
+++ b/editors/pluma/Makefile    Sun Jun 30 13:34:40 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/05/08 01:55:16 gutteridge Exp $
+# $NetBSD: Makefile,v 1.22 2019/06/30 13:34:40 gutteridge Exp $
 
 # XXX: meta-pkgs/mate/Makefile.common includes pyversion.mk which sets the
 # python version too early and clashes with PYTHON_VERSIONS_INCOMPATIBLE
@@ -8,6 +8,7 @@
 .include "../../meta-pkgs/mate/Makefile.common"
 
 DISTNAME=      pluma-${VERSION:R}.1
+PKGREVISION=   1
 CATEGORIES=    editors
 
 COMMENT=       Small and lightweight UTF-8 text editor for MATE
diff -r 695a2edce559 -r 46c310dd70b6 editors/pluma/options.mk
--- a/editors/pluma/options.mk  Sat Jun 29 22:36:15 2019 +0000
+++ b/editors/pluma/options.mk  Sun Jun 30 13:34:40 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2019/04/26 13:13:56 maya Exp $
+# $NetBSD: options.mk,v 1.10 2019/06/30 13:34:40 gutteridge Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.pluma
 PKG_SUPPORTED_OPTIONS= enchant
@@ -35,5 +35,6 @@
 # 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.
+TOOL_DEPENDS+=         python27-[0-9]*:../../lang/python27
 PYTHONBIN=             ${PREFIX}/bin/python2.7
 .endif



Home | Main Index | Thread Index | Old Index