aboutsummaryrefslogtreecommitdiffstats
path: root/Mk
diff options
context:
space:
mode:
authorjbeich <jbeich@FreeBSD.org>2018-06-18 00:50:30 +0800
committerjbeich <jbeich@FreeBSD.org>2018-06-18 00:50:30 +0800
commit54b6491c6479de53554731c6dce1ae5887014185 (patch)
treee05ee453411cf047e12b74a4f6532653b7713bd1 /Mk
parent6c782f33de4f62353d04c2ececd7860a44d78a26 (diff)
downloadfreebsd-ports-gnome-54b6491c6479de53554731c6dce1ae5887014185.tar.gz
freebsd-ports-gnome-54b6491c6479de53554731c6dce1ae5887014185.tar.zst
freebsd-ports-gnome-54b6491c6479de53554731c6dce1ae5887014185.zip
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)
Diffstat (limited to 'Mk')
-rw-r--r--Mk/Uses/gecko.mk12
1 files changed, 6 insertions, 6 deletions
diff --git a/Mk/Uses/gecko.mk b/Mk/Uses/gecko.mk
index 9df59c251201..72805889a19f 100644
--- a/Mk/Uses/gecko.mk
+++ b/Mk/Uses/gecko.mk
@@ -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