pkgsrc-Changes archive

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

CVS commit: pkgsrc/www/seamonkey



Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Dec 22 13:34:25 UTC 2020

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

Log Message:
seamonkey: build fix: make Python requirements explicit

Likely this is needed because gtk2 no longer provides python2.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 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.4 pkgsrc/www/seamonkey/mozilla-common.mk:1.5
--- pkgsrc/www/seamonkey/mozilla-common.mk:1.4  Sun Jun 28 11:32:04 2020
+++ pkgsrc/www/seamonkey/mozilla-common.mk      Tue Dec 22 13:34:25 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.4 2020/06/28 11:32:04 nia Exp $
+# $NetBSD: mozilla-common.mk,v 1.5 2020/12/22 13:34:25 nia Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -14,6 +14,19 @@ GCC_REQD+=           4.9
 
 .include "../../mk/bsd.prefs.mk"
 
+# Python 2.7 and Python 3.6 or later are required simultaneously.
+PYTHON_VERSIONS_ACCEPTED=      27
+PYTHON_FOR_BUILD_ONLY=         tool
+.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./}
+.else
+TOOL_DEPENDS+=                 python38-[0-9]*:../../lang/python38
+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