Properly define DISTFILES where appropriate when MOZILLA_COMMIT is set.

Dammit.
This commit is contained in:
landry 2018-03-14 06:07:11 +00:00
parent ba76fd1b63
commit 99d10cbc39
2 changed files with 4 additions and 3 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.345 2018/03/13 19:29:35 landry Exp $
# $OpenBSD: Makefile,v 1.346 2018/03/14 06:07:11 landry Exp $
COMMENT = Mozilla web browser
ONLY_FOR_ARCHS = amd64 i386
@ -13,6 +13,7 @@ MOZILLA_CODENAME = browser
MASTER_SITES = https://distfiles.bsdfrog.org/mozilla/
HOMEPAGE = https://www.mozilla.org/firefox/
DISTFILES = ${MOZILLA_DIST}-${MOZILLA_DIST_VERSION}${EXTRACT_SUFX}
SO_VERSION = 76.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.

View File

@ -1,4 +1,4 @@
# $OpenBSD: mozilla.port.mk,v 1.114 2018/03/13 21:18:53 landry Exp $
# $OpenBSD: mozilla.port.mk,v 1.115 2018/03/14 06:07:11 landry Exp $
# ppc: firefox-esr/thunderbird xpcshell segfaults during startup compilation
# ppc: seamonkey/firefox - failure to link for atomic ops on 64 bits
@ -32,7 +32,7 @@ MASTER_SITES ?= https://releases.mozilla.org/pub/mozilla.org/${MOZILLA_DIST}/rel
.if defined(MOZILLA_COMMIT) && defined(MOZILLA_BRANCH)
DISTNAME = ${MOZILLA_DIST}-${MOZILLA_DIST_VERSION}
DISTFILES = ${MOZILLA_DIST}-${MOZILLA_DIST_VERSION}${EXTRACT_SUFX}{${MOZILLA_COMMIT}${EXTRACT_SUFX}}
DISTFILES ?= ${MOZILLA_DIST}-${MOZILLA_DIST_VERSION}${EXTRACT_SUFX}{${MOZILLA_COMMIT}${EXTRACT_SUFX}}
WRKDIST = ${WRKDIR}/mozilla-${MOZILLA_BRANCH}-${MOZILLA_COMMIT}
MASTER_SITES ?= https://hg.mozilla.org/releases/mozilla-${MOZILLA_BRANCH}/archive/
EXTRACT_SUFX = .tar.bz2