CVS commit: pkgsrc/www/firefox60

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Mon May 11 18:06:38 UTC 2020

Modified Files:
        pkgsrc/www/firefox60: mozilla-common.mk

Log Message:
www/thunderbird60: skip SUBST block for Python interpreter

The mentioned file only contains <(PYTHON), but not <(python).


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/firefox60/mozilla-common.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox60/mozilla-common.mk
diff -u pkgsrc/www/firefox60/mozilla-common.mk:1.10 pkgsrc/www/firefox60/mozilla-common.mk:1.11
--- pkgsrc/www/firefox60/mozilla-common.mk:1.10 Tue Apr 28 06:56:48 2020
+++ pkgsrc/www/firefox60/mozilla-common.mk      Mon May 11 18:06:38 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.10 2020/04/28 06:56:48 riastradh Exp $
+# $NetBSD: mozilla-common.mk,v 1.11 2020/05/11 18:06:38 rillig Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -108,11 +108,13 @@ CONFIG_SUB_OVERRIDE+=             ${MOZILLA_DIR}/js
 CONFIGURE_ENV+=                CPP=${CPP}
 ALL_ENV+=              SHELL=${CONFIG_SHELL:Q}
 
+.if ${PKGPATH} != mail/thunderbird60
 SUBST_CLASSES+=                python
 SUBST_STAGE.python=    pre-configure
 SUBST_MESSAGE.python=  Fixing path to python.
 SUBST_FILES.python+=   media/webrtc/trunk/build/common.gypi
 SUBST_SED.python+=     -e 's,<!(python,<!(${PYTHONBIN},'
+.endif
 
 # Build outside ${WRKSRC}
 # Try to avoid conflict with config/makefiles/xpidl/Makefile.in