Date: Sun, 17 Jun 2018 16:50:31 +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: r472612 - head/Mk/Uses Message-ID: <201806171650.w5HGoVCD001569@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sun Jun 17 16:50:30 2018 New Revision: 472612 URL: https://svnweb.freebsd.org/changeset/ports/472612 Log: gecko: check app compatibility for -i18n via package registry make[5]: "/usr/ports/Mk/Uses/gecko.mk" line 48: warning: "/usr/local/bin/firefox --version 2>/dev/null" returned non-zero status $ sudo firefox --version Running Nightly as root in a regular user's session is not supported. ($XAUTHORITY is /home/foo/.Xauthority which is owned by foo.) https://bugzilla.mozilla.org/show_bug.cgi?id=1323302 PR: 229064 Reported by: Vladimir Omelchuk Analyzed by: Rainer Hurling Submitted by: Walter Schwarzenfeld (based on) Modified: head/Mk/Uses/gecko.mk (contents, props changed) Modified: head/Mk/Uses/gecko.mk ============================================================================== --- head/Mk/Uses/gecko.mk Sun Jun 17 16:43:58 2018 (r472611) +++ head/Mk/Uses/gecko.mk Sun Jun 17 16:50:30 2018 (r472612) @@ -45,8 +45,8 @@ _GECKO_TYPE= firefox 60_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox .if exists(${LOCALBASE}/bin/firefox) -_GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/firefox --version 2>/dev/null -_GECKO_INSTALLED_VER:= ${_GECKO_INSTALLED_VER:M[0-9][0-9]*:C/([0-9][0-9]).*/\1/g} +_GECKO_INSTALLED_VER!= ${PKG_QUERY} %v firefox firefox-esr +_GECKO_INSTALLED_VER:= ${_GECKO_INSTALLED_VER:C/\..*//} .endif .elif ${gecko_ARGS:Mseamonkey} @@ -56,8 +56,8 @@ _GECKO_VERSIONS= 49 _GECKO_TYPE= seamonkey .if exists(${LOCALBASE}/bin/seamonkey) -_GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/seamonkey --version 2>/dev/null -_GECKO_INSTALLED_VER:= ${_GECKO_INSTALLED_VER:M[0-9]*:C/[0-9].([0-9][0-9]).*/\1/g} +_GECKO_INSTALLED_VER!= ${PKG_QUERY} %v seamonkey +_GECKO_INSTALLED_VER:= ${_GECKO_INSTALLED_VER:C/[0-9]*\.//:C/\..*//} .endif # Dependence lines for different Seamonkey versions @@ -70,8 +70,8 @@ _GECKO_VERSIONS= 52 _GECKO_TYPE= thunderbird .if exists(${LOCALBASE}/bin/thunderbird) -_GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/thunderbird --version 2>/dev/null -_GECKO_INSTALLED_VER:= ${_GECKO_INSTALLED_VER:M[0-9][0-9]*:C/([0-9][0-9]).*/\1/g} +_GECKO_INSTALLED_VER!= ${PKG_QUERY} %v thunderbird +_GECKO_INSTALLED_VER:= ${_GECKO_INSTALLED_VER:C/\..*//} .endif # Dependence lines for different Thunderbird versions
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806171650.w5HGoVCD001569>