git: d8400d2cc3eb - main - www/chromium: pet portclippy

[Rene Ladan]

The branch main has been updated by rene:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d8400d2cc3eb157b040171a5ac1e07aebcb626e9

commit d8400d2cc3eb157b040171a5ac1e07aebcb626e9
Author:     Rene Ladan <rene at FreeBSD.org>
AuthorDate: 2021-04-12 15:31:54 +0000
Commit:     Rene Ladan <rene at FreeBSD.org>
CommitDate: 2021-04-12 15:35:10 +0000

    www/chromium: pet portclippy
---
 www/chromium/Makefile | 42 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 237d49d69b1f..af9dce4fd031 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -69,22 +69,22 @@ RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 USES=		bison compiler:c++17-lang cpe desktop-file-utils dos2unix gl gnome jpeg localbase:ldflags \
 		ninja perl5 pkgconfig python:2.7,build shebangfix tar:xz xorg
 
-MAKE_ARGS=	-C out/${BUILDTYPE}
-BINARY_ALIAS=	python=${PYTHON_CMD}
-DOS2UNIX_FILES=	third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h
-
 CPE_VENDOR=	google
 CPE_PRODUCT=	chrome
+DOS2UNIX_FILES=	third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h
 USE_GL=		gbm gl
+USE_GNOME=	atk dconf glib20 gtk30 libxml2 libxslt
+INSTALLS_ICONS=	yes
 USE_LDCONFIG=	${DATADIR}
 USE_PERL5=	build
 USE_XORG=	x11 xcb xcomposite xcursor xext xdamage xfixes xi \
 		xorgproto xrandr xrender xscrnsaver xtst
-USE_GNOME=	atk dconf glib20 gtk30 libxml2 libxslt
 SHEBANG_FILES=	chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-format
+
+MAKE_ARGS=	-C out/${BUILDTYPE}
 ALL_TARGET=	chrome
-INSTALLS_ICONS=	yes
 
+BINARY_ALIAS=	python=${PYTHON_CMD}
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clang
 
 # TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn)
@@ -128,21 +128,17 @@ SUB_FILES=	chromium-browser.desktop chrome
 SUB_LIST+=	COMMENT="${COMMENT}"
 
 OPTIONS_DEFINE=	CODECS CUPS DEBUG DRIVER KERBEROS LTO TEST
-CODECS_DESC=	Compile and enable patented codecs like H.264
-DRIVER_DESC=	Install chromedriver
+OPTIONS_DEFAULT=	CODECS CUPS DRIVER KERBEROS SNDIO
 OPTIONS_GROUP=		AUDIO
 OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO SNDIO
-
 OPTIONS_RADIO=		KERBEROS
 OPTIONS_RADIO_KERBEROS=	HEIMDAL HEIMDAL_BASE MIT
-HEIMDAL_DESC=		Heimdal Kerberos (security/heimdal)
+OPTIONS_SUB=		yes
+CODECS_DESC=		Compile and enable patented codecs like H.264
+DRIVER_DESC=		Install chromedriver
 HEIMDAL_BASE_DESC=	Heimdal Kerberos (base)
+HEIMDAL_DESC=		Heimdal Kerberos (security/heimdal)
 MIT_DESC=		MIT Kerberos (security/krb5)
-HEIMDAL_LIB_DEPENDS=	libkrb.so.26:security/heimdal
-MIT_LIB_DEPENDS=	libkrb.so.3:security/krb5
-
-OPTIONS_DEFAULT=	CODECS CUPS DRIVER KERBEROS SNDIO
-OPTIONS_SUB=		yes
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
@@ -174,6 +170,7 @@ DEBUG_VARS_OFF=		BUILDTYPE=Release \
 
 DRIVER_MAKE_ARGS=	chromedriver
 
+HEIMDAL_LIB_DEPENDS=	libkrb.so.26:security/heimdal
 KERBEROS_VARS=		GN_ARGS+=use_kerberos=true
 KERBEROS_VARS_OFF=	GN_ARGS+=use_kerberos=false
 
@@ -181,6 +178,7 @@ LTO_VARS=		GN_ARGS+=use_thin_lto=true \
 			GN_ARGS+=thin_lto_enable_optimizations=true \
 			WANTSPACE="14 GB"
 
+MIT_LIB_DEPENDS=	libkrb.so.3:security/krb5
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_VARS=	GN_ARGS+=use_pulseaudio=true
 PULSEAUDIO_VARS_OFF=	GN_ARGS+=use_pulseaudio=false
@@ -194,9 +192,9 @@ SNDIO_VARS=		GN_ARGS+=use_sndio=true
 SNDIO_VARS_OFF=		GN_ARGS+=use_sndio=false
 
 .include "Makefile.tests"
-TEST_ALL_TARGET=	${TEST_TARGETS}
 TEST_DISTFILES=		${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} \
 			test_fonts-85${EXTRACT_SUFX}:fonts
+TEST_ALL_TARGET=	${TEST_TARGETS}
 
 .include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
@@ -289,12 +287,6 @@ do-configure:
 	${LN} -sf ${WRKSRC}/buildtools/linux64/clang-format ${WRKSRC}/buildtools/freebsd
 	${LN} -sf ${WRKSRC}/out/${BUILDTYPE}/gn ${WRKSRC}/buildtools/freebsd
 
-do-test-TEST-on:
-.for t in ${TEST_TARGETS}
-	cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \
-		./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE}
-.endfor
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_MAN} ${WRKSRC}/chrome/app/resources/manpage.1.in \
@@ -354,4 +346,10 @@ post-install-DRIVER-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \
 		${STAGEDIR}${PREFIX}/bin
 
+do-test-TEST-on:
+.for t in ${TEST_TARGETS}
+	cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \
+		./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE}
+.endfor
+
 .include <bsd.port.post.mk>