Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 18 Sep 2020 15:56:04 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r548890 - in head: Mk mail/thunderbird www/firefox www/firefox-esr
Message-ID:  <202009181556.08IFu4rc098089@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Fri Sep 18 15:56:04 2020
New Revision: 548890
URL: https://svnweb.freebsd.org/changeset/ports/548890

Log:
  gecko: drop python2 dependency after r548882

Modified:
  head/Mk/bsd.gecko.mk   (contents, props changed)
  head/mail/thunderbird/Makefile   (contents, props changed)
  head/www/firefox-esr/Makefile   (contents, props changed)
  head/www/firefox/Makefile   (contents, props changed)

Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk	Fri Sep 18 15:17:59 2020	(r548889)
+++ head/Mk/bsd.gecko.mk	Fri Sep 18 15:56:04 2020	(r548890)
@@ -63,7 +63,7 @@ MOZILLA_VER?=	${PORTVERSION}
 MOZILLA_BIN?=	${PORTNAME}-bin
 MOZILLA_EXEC_NAME?=${MOZILLA}
 USES+=		compiler:c++17-lang cpe gl gmake gnome iconv localbase perl5 pkgconfig \
-			python:2.7,build desktop-file-utils
+			python:3.6+,build desktop-file-utils
 CPE_VENDOR?=mozilla
 USE_GL=		gl
 USE_GNOME=	cairo gdkpixbuf2 gtk20 gtk30
@@ -72,20 +72,19 @@ USE_XORG=	x11 xcb xcomposite xdamage xext xfixes xrend
 HAS_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
 LDFLAGS+=		-Wl,--as-needed
-BINARY_ALIAS+=	python3=python${PYTHON3_DEFAULT}
+BINARY_ALIAS+=	python3=${PYTHON_CMD}
 
 BUNDLE_LIBS=	yes
 
 BUILD_DEPENDS+=	llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} \
 				rust-cbindgen>=0.14.3:devel/rust-cbindgen \
 				${RUST_DEFAULT}>=1.41:lang/${RUST_DEFAULT} \
-				${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \
 				node:www/node
 LIB_DEPENDS+=	libdrm.so:graphics/libdrm
 MOZ_EXPORT+=	${CONFIGURE_ENV} \
 				LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \
 				PERL="${PERL}" \
-				PYTHON3="${LOCALBASE}/bin/python${PYTHON3_DEFAULT}" \
+				PYTHON3="${PYTHON_CMD}" \
 				RUSTFLAGS="${RUSTFLAGS}"
 MOZ_OPTIONS+=	--prefix="${PREFIX}"
 MOZ_MK_OPTIONS+=MOZ_OBJDIR="${BUILD_WRKSRC}"

Modified: head/mail/thunderbird/Makefile
==============================================================================
--- head/mail/thunderbird/Makefile	Fri Sep 18 15:17:59 2020	(r548889)
+++ head/mail/thunderbird/Makefile	Fri Sep 18 15:56:04 2020	(r548890)
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	nspr>=4.26:devel/nspr \
 		graphite2>=1.3.14:graphics/graphite2 \
 		png>=1.6.35:graphics/png \
 		libvpx>=1.8.2:multimedia/libvpx \
-		py${PYTHON3_DEFAULT:S/.//}-sqlite3>0:databases/py-sqlite3@py${PYTHON3_DEFAULT:S/.//} \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf-2.13:devel/autoconf213 \
 		nasm:devel/nasm \

Modified: head/www/firefox-esr/Makefile
==============================================================================
--- head/www/firefox-esr/Makefile	Fri Sep 18 15:17:59 2020	(r548889)
+++ head/www/firefox-esr/Makefile	Fri Sep 18 15:56:04 2020	(r548890)
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	nspr>=4.26:devel/nspr \
 		graphite2>=1.3.14:graphics/graphite2 \
 		png>=1.6.35:graphics/png \
 		libvpx>=1.8.2:multimedia/libvpx \
-		py${PYTHON3_DEFAULT:S/.//}-sqlite3>0:databases/py-sqlite3@py${PYTHON3_DEFAULT:S/.//} \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf-2.13:devel/autoconf213 \
 		nasm:devel/nasm \

Modified: head/www/firefox/Makefile
==============================================================================
--- head/www/firefox/Makefile	Fri Sep 18 15:17:59 2020	(r548889)
+++ head/www/firefox/Makefile	Fri Sep 18 15:56:04 2020	(r548890)
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	nspr>=4.26:devel/nspr \
 		graphite2>=1.3.14:graphics/graphite2 \
 		png>=1.6.35:graphics/png \
 		libvpx>=1.8.2:multimedia/libvpx \
-		py${PYTHON3_DEFAULT:S/.//}-sqlite3>0:databases/py-sqlite3@py${PYTHON3_DEFAULT:S/.//} \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf-2.13:devel/autoconf213 \
 		nasm:devel/nasm \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009181556.08IFu4rc098089>