pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/www/seamonkey Make www/seamonkey honor PYTHON_VERSION_...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e9765e6b9672
branches:  trunk
changeset: 377282:e9765e6b9672
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Mon Apr 18 18:34:33 2022 +0000

description:
Make www/seamonkey honor PYTHON_VERSION_DEFAULT properly.

Include pyversion.mk before testing PYTHON_VERSION_DEFAULT; otherwise
it's not necessarily set.

diffstat:

 www/seamonkey/mozilla-common.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 35cf792aac04 -r e9765e6b9672 www/seamonkey/mozilla-common.mk
--- a/www/seamonkey/mozilla-common.mk   Mon Apr 18 18:28:07 2022 +0000
+++ b/www/seamonkey/mozilla-common.mk   Mon Apr 18 18:34:33 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.10 2021/11/30 15:41:24 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.11 2022/04/18 18:34:33 dholland Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -18,6 +18,8 @@
 PYTHON_VERSIONS_ACCEPTED=      27
 PYTHON_FOR_BUILD_ONLY=         tool
 TOOL_DEPENDS+=                 ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+# Include pyversion.mk after setting PYTHON_* but before testing the default.
+.include "../../lang/python/pyversion.mk"
 .if !empty(PYTHON_VERSION_DEFAULT:M3[6789])
 TOOL_DEPENDS+=                 python${PYTHON_VERSION_DEFAULT}-[0-9]*:../../lang/python${PYTHON_VERSION_DEFAULT}
 ALL_ENV+=                      PYTHON3=${PREFIX}/bin/python${PYTHON_VERSION_DEFAULT:S/3/3./}
@@ -26,8 +28,6 @@
 ALL_ENV+=                      PYTHON3=${PREFIX}/bin/python3.8
 .endif
 
-.include "../../lang/python/pyversion.mk"
-
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 BUILD_DEPENDS+=                yasm>=1.1:../../devel/yasm
 



Home | Main Index | Thread Index | Old Index