CVS commit: pkgsrc/www/seamonkey

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Mon Apr 18 18:34:33 UTC 2022

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

Log Message:
Make www/seamonkey honor PYTHON_VERSION_DEFAULT properly.

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


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/seamonkey/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/seamonkey/mozilla-common.mk
diff -u pkgsrc/www/seamonkey/mozilla-common.mk:1.10 pkgsrc/www/seamonkey/mozilla-common.mk:1.11
--- pkgsrc/www/seamonkey/mozilla-common.mk:1.10 Tue Nov 30 15:41:24 2021
+++ pkgsrc/www/seamonkey/mozilla-common.mk      Mon Apr 18 18:34:33 2022
@@ -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 @@ GCC_REQD+=            4.9
 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 @@ TOOL_DEPENDS+=                        python38-[0-9]*:../../l
 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