Received: by mail.netbsd.org (Postfix, from userid 605) id 81D4484FCB; Fri, 29 Jun 2018 12:51:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9099884E7A for ; Fri, 29 Jun 2018 12:51:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id gbCfn3NY2m7o for ; Fri, 29 Jun 2018 12:51:56 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id E432B84E4E for ; Fri, 29 Jun 2018 12:51:55 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D263DFBEC; Fri, 29 Jun 2018 12:51:55 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1530276715280820" MIME-Version: 1.0 Date: Fri, 29 Jun 2018 12:51:55 +0000 From: "Ryo ONODERA" Subject: CVS commit: pkgsrc/www/firefox To: pkgsrc-changes@NetBSD.org Reply-To: ryoon@netbsd.org X-Mailer: log_accum Message-Id: <20180629125155.D263DFBEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1530276715280820 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: ryoon Date: Fri Jun 29 12:51:55 UTC 2018 Modified Files: pkgsrc/www/firefox: mozilla-common.mk Log Message: Fix build. Use Python 2 and 3.5 or later and increment required versions Reported from rjs@. To generate a diff of this commit: cvs rdiff -u -r1.108 -r1.109 pkgsrc/www/firefox/mozilla-common.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1530276715280820 Content-Disposition: inline Content-Length: 2040 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/firefox/mozilla-common.mk diff -u pkgsrc/www/firefox/mozilla-common.mk:1.108 pkgsrc/www/firefox/mozilla-common.mk:1.109 --- pkgsrc/www/firefox/mozilla-common.mk:1.108 Wed Mar 21 16:06:29 2018 +++ pkgsrc/www/firefox/mozilla-common.mk Fri Jun 29 12:51:55 2018 @@ -1,10 +1,21 @@ -# $NetBSD: mozilla-common.mk,v 1.108 2018/03/21 16:06:29 taca Exp $ +# $NetBSD: mozilla-common.mk,v 1.109 2018/06/29 12:51:55 ryoon Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # # used by www/firefox/Makefile # used by www/seamonkey/Makefile +# Python 2.7 and Python 3.5 or later are required simultaneously. +PYTHON_VERSIONS_ACCEPTED= 27 +PYTHON_FOR_BUILD_ONLY= tool +.if !empty(PYTHON_VERSION_DEFAULT:M36) || !empty(PYTHON_VERSION_DEFAULT:M35) +TOOL_DEPENDS+= python${PYTHON_VERSION_DEFAULT}-[0-9]*:../../lang/python${PYTHON_VERSION_DEFAULT} +ALL_ENV+= PYTHON3=${LOCALBASE}/bin/python${PYTHON_VERSION_DEFAULT:S/3/3./} +.else +TOOL_DEPENDS+= python36-[0-9]*:../../lang/python36 +ALL_ENV+= PYTHON3=${LOCALBASE}/bin/python3.6 +.endif + HAS_CONFIGURE= yes CONFIGURE_ARGS+= --prefix=${PREFIX} USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip @@ -36,7 +47,7 @@ test: TOOLS_PLATFORM.tar= ${TOOLS_PATH.bsdtar} USE_TOOLS+= bsdtar .endif -GCC_REQD+= 4.9 +GCC_REQD+= 6.1 .if ${MACHINE_ARCH} == "i386" # Fix for PR pkg/48152. CXXFLAGS+= -march=i586 @@ -192,7 +203,7 @@ BUILDLINK_API_DEPENDS.libevent+= libeven BUILDLINK_API_DEPENDS.nspr+= nspr>=4.18 .include "../../devel/nspr/buildlink3.mk" .include "../../textproc/icu/buildlink3.mk" -BUILDLINK_API_DEPENDS.nss+= nss>=3.35 +BUILDLINK_API_DEPENDS.nss+= nss>=3.37.3 .include "../../devel/nss/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" @@ -215,3 +226,4 @@ BUILDLINK_API_DEPENDS.pixman+= pixman>=0 .include "../../x11/pixman/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/gtk3/buildlink3.mk" +.include "../../lang/python/pyversion.mk" --_----------=_1530276715280820--