Sat Apr 25 16:55:07 2020 UTC ()
www/firefox52: remove no-op SUBST block for hunspell

The word PREFIX does not occur in extensions/spellcheck/hunspell anymore.


(rillig)
diff -r1.53 -r1.54 pkgsrc/www/firefox52/Makefile
cvs diff -r1.53 -r1.54 pkgsrc/www/firefox52/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox52/Makefile 2020/04/24 13:24:21 1.53
+++ pkgsrc/www/firefox52/Makefile 2020/04/25 16:55:07 1.54
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.53 2020/04/24 13:24:21 nia Exp $ 1# $NetBSD: Makefile,v 1.54 2020/04/25 16:55:07 rillig Exp $
2 2
3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
4MOZ_BRANCH= 52.9 4MOZ_BRANCH= 52.9
5MOZ_BRANCH_MINOR= .0esr 5MOZ_BRANCH_MINOR= .0esr
6 6
7DISTNAME= firefox-${FIREFOX_VER}.source 7DISTNAME= firefox-${FIREFOX_VER}.source
8PKGNAME= firefox${MOZ_BRANCH:C/\..*$//}-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//} 8PKGNAME= firefox${MOZ_BRANCH:C/\..*$//}-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
9PKGREVISION= 25 9PKGREVISION= 25
10CATEGORIES= www 10CATEGORIES= www
11MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} 11MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
12MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/} 12MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
13EXTRACT_SUFX= .tar.xz 13EXTRACT_SUFX= .tar.xz
14 14
@@ -56,32 +56,26 @@ CHECK_INTERPRETER_SKIP+= lib/firefox-sdk @@ -56,32 +56,26 @@ CHECK_INTERPRETER_SKIP+= lib/firefox-sdk
56CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/xpidl.py 56CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/xpidl.py
57CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/xpt.py 57CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/xpt.py
58 58
59CHECK_WRKREF_SKIP+= lib/${PKGBASE}/chrome/toolkit/content/global/buildconfig.html 59CHECK_WRKREF_SKIP+= lib/${PKGBASE}/chrome/toolkit/content/global/buildconfig.html
60 60
61MOZILLA= ${PKGBASE} 61MOZILLA= ${PKGBASE}
62MOZILLA_ICON= ${WRKSRC}/${OBJDIR}/dist/firefox/browser/chrome/icons/default/default48.png 62MOZILLA_ICON= ${WRKSRC}/${OBJDIR}/dist/firefox/browser/chrome/icons/default/default48.png
63.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding) 63.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
64MOZILLA_NAME= Firefox 64MOZILLA_NAME= Firefox
65.else 65.else
66MOZILLA_NAME= Browser 66MOZILLA_NAME= Browser
67.endif 67.endif
68 68
69SUBST_CLASSES+= sys-dic 
70SUBST_STAGE.sys-dic= pre-configure 
71SUBST_MESSAGE.sys-dic= Reference to system hunspell dictionaries. 
72SUBST_FILES.sys-dic= extensions/spellcheck/hunspell/glue/mozHunspell.cpp 
73SUBST_VARS.sys-dic= PREFIX 
74 
75post-extract: 69post-extract:
76 mv ${WRKSRC}/gfx/ycbcr/yuv_row_arm.s ${WRKSRC}/gfx/ycbcr/yuv_row_arm.S 70 mv ${WRKSRC}/gfx/ycbcr/yuv_row_arm.s ${WRKSRC}/gfx/ycbcr/yuv_row_arm.S
77 ${CP} ${FILESDIR}/cubeb_sun.c ${WRKSRC}/media/libcubeb/src 71 ${CP} ${FILESDIR}/cubeb_sun.c ${WRKSRC}/media/libcubeb/src
78 72
79pre-configure: 73pre-configure:
80 cd ${WRKSRC} && autoconf 74 cd ${WRKSRC} && autoconf
81 cd ${WRKSRC}/js/src && autoconf 75 cd ${WRKSRC}/js/src && autoconf
82 cd ${WRKSRC} && mkdir ${OBJDIR} 76 cd ${WRKSRC} && mkdir ${OBJDIR}
83 cd ${WRKSRC}/${OBJDIR} && touch old-configure.vars 77 cd ${WRKSRC}/${OBJDIR} && touch old-configure.vars
84 78
85post-build: 79post-build:
86 ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \ 80 ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \
87 -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \ 81 -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \