Fri Jun 18 18:41:27 2021 UTC ()
firefox68: explicitly use autoconf-2.13


(nia)
diff -r1.43 -r1.44 pkgsrc/www/firefox68/Makefile
cvs diff -r1.43 -r1.44 pkgsrc/www/firefox68/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox68/Attic/Makefile 2021/05/24 19:55:14 1.43
+++ pkgsrc/www/firefox68/Attic/Makefile 2021/06/18 18:41:27 1.44
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.43 2021/05/24 19:55:14 wiz Exp $ 1# $NetBSD: Makefile,v 1.44 2021/06/18 18:41:27 nia Exp $
2 2
3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
4MOZ_BRANCH= 68.12 4MOZ_BRANCH= 68.12
5MOZ_BRANCH_MINOR= .0esr 5MOZ_BRANCH_MINOR= .0esr
6 6
7DISTNAME= firefox-${FIREFOX_VER}.source 7DISTNAME= firefox-${FIREFOX_VER}.source
8PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//:S/firefox-/firefox68-/} 8PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//:S/firefox-/firefox68-/}
9PKGREVISION= 8 9PKGREVISION= 8
10CATEGORIES= www 10CATEGORIES= www
11MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} 11MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
12EXTRACT_SUFX= .tar.xz 12EXTRACT_SUFX= .tar.xz
13 13
14MAINTAINER= ryoon@NetBSD.org 14MAINTAINER= ryoon@NetBSD.org
@@ -66,28 +66,28 @@ CHECK_WRKREF_SKIP+= lib/${MOZILLA}/chrom @@ -66,28 +66,28 @@ CHECK_WRKREF_SKIP+= lib/${MOZILLA}/chrom
66 66
67MOZILLA= ${PKGBASE} 67MOZILLA= ${PKGBASE}
68MOZILLA_ICON= ${WRKSRC}/${OBJDIR}/dist/${MOZILLA}/browser/chrome/icons/default/default48.png 68MOZILLA_ICON= ${WRKSRC}/${OBJDIR}/dist/${MOZILLA}/browser/chrome/icons/default/default48.png
69.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding) 69.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
70MOZILLA_NAME= Firefox 70MOZILLA_NAME= Firefox
71.else 71.else
72MOZILLA_NAME= Browser 72MOZILLA_NAME= Browser
73.endif 73.endif
74 74
75post-extract: 75post-extract:
76 ${CP} ${FILESDIR}/cubeb_sun.c ${WRKSRC}/media/libcubeb/src/cubeb_sun.c 76 ${CP} ${FILESDIR}/cubeb_sun.c ${WRKSRC}/media/libcubeb/src/cubeb_sun.c
77 77
78pre-configure: 78pre-configure:
79 cd ${WRKSRC} && autoconf 79 cd ${WRKSRC} && autoconf-2.13
80 cd ${WRKSRC}/js/src && autoconf 80 cd ${WRKSRC}/js/src && autoconf-2.13
81 cd ${WRKSRC} && mkdir ${OBJDIR} 81 cd ${WRKSRC} && mkdir ${OBJDIR}
82 cd ${WRKSRC}/${OBJDIR} && touch old-configure.vars 82 cd ${WRKSRC}/${OBJDIR} && touch old-configure.vars
83 83
84post-build: 84post-build:
85 ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \ 85 ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \
86 -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \ 86 -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \
87 -e 's|@FIREFOX_ICON@|${MOZILLA}.png|g' \ 87 -e 's|@FIREFOX_ICON@|${MOZILLA}.png|g' \
88 < ${FILESDIR}/desktop.in \ 88 < ${FILESDIR}/desktop.in \
89 > ${WRKDIR}/desktop 89 > ${WRKDIR}/desktop
90 90
91INSTALLATION_DIRS+= share/applications share/pixmaps 91INSTALLATION_DIRS+= share/applications share/pixmaps
92post-install: 92post-install:
93 ${ECHO} '#! /bin/sh' > ${DESTDIR}${PREFIX}/bin/${MOZILLA} 93 ${ECHO} '#! /bin/sh' > ${DESTDIR}${PREFIX}/bin/${MOZILLA}