Sat Dec 26 10:35:17 2020 UTC ()
Remove now-actively-harmful 32-bit ARM hack from Mozilla packages.


(nia)
diff -r1.262 -r1.263 pkgsrc/mail/thunderbird/Makefile
diff -r1.1 -r1.2 pkgsrc/mail/thunderbird68/Makefile
diff -r1.460 -r1.461 pkgsrc/www/firefox/Makefile
diff -r1.36 -r1.37 pkgsrc/www/firefox68/Makefile
diff -r1.14 -r1.15 pkgsrc/www/firefox78/Makefile
diff -r1.225 -r1.226 pkgsrc/www/seamonkey/Makefile

cvs diff -r1.262 -r1.263 pkgsrc/mail/thunderbird/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/thunderbird/Makefile 2020/12/07 12:30:56 1.262
+++ pkgsrc/mail/thunderbird/Makefile 2020/12/26 10:35:16 1.263
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.262 2020/12/07 12:30:56 ryoon Exp $ 1# $NetBSD: Makefile,v 1.263 2020/12/26 10:35:16 nia Exp $
2 2
3DISTNAME= thunderbird-${TB_VER}.source 3DISTNAME= thunderbird-${TB_VER}.source
4PKGNAME= thunderbird-${TB_VER} 4PKGNAME= thunderbird-${TB_VER}
5TB_VER= 78.5.1 5TB_VER= 78.5.1
6CATEGORIES= mail 6CATEGORIES= mail
7MASTER_SITES= ${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/} 7MASTER_SITES= ${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/}
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.thunderbird.net/en-US/ 11HOMEPAGE= https://www.thunderbird.net/en-US/
12COMMENT= Organize, secure and customize your mail 12COMMENT= Organize, secure and customize your mail
13LICENSE= mpl-1.1 13LICENSE= mpl-1.1
14 14
@@ -67,28 +67,26 @@ SUBST_STAGE.cksum= pre-configure @@ -67,28 +67,26 @@ SUBST_STAGE.cksum= pre-configure
67SUBST_FILES.cksum+= ${crate}/.cargo-checksum.json 67SUBST_FILES.cksum+= ${crate}/.cargo-checksum.json
68.endfor 68.endfor
69.for from to in ${CKSUMS} 69.for from to in ${CKSUMS}
70SUBST_SED.cksum+= -e 's,${from},${to},g' 70SUBST_SED.cksum+= -e 's,${from},${to},g'
71.endfor 71.endfor
72 72
73SUBST_CLASSES+= netbsdtag 73SUBST_CLASSES+= netbsdtag
74SUBST_STAGE.netbsdtag= pre-configure 74SUBST_STAGE.netbsdtag= pre-configure
75SUBST_FILES.netbsdtag= comm/third_party/rnp/src/librekey/key_store_pgp.cpp 75SUBST_FILES.netbsdtag= comm/third_party/rnp/src/librekey/key_store_pgp.cpp
76SUBST_SED.netbsdtag= -e 's/__NetBSD__/__NEVER__/' 76SUBST_SED.netbsdtag= -e 's/__NetBSD__/__NEVER__/'
77 77
78post-extract: 78post-extract:
79 ${CP} ${FILESDIR}/cubeb_sun.c ${WRKSRC}/media/libcubeb/src/cubeb_sun.c 79 ${CP} ${FILESDIR}/cubeb_sun.c ${WRKSRC}/media/libcubeb/src/cubeb_sun.c
80 mv ${WRKSRC}${MOZILLA_DIR}/gfx/ycbcr/yuv_row_arm.s \ 
81 ${WRKSRC}${MOZILLA_DIR}/gfx/ycbcr/yuv_row_arm.S 
82 80
83pre-configure: 81pre-configure:
84 cd ${WRKSRC} && mkdir ${OBJDIR} 82 cd ${WRKSRC} && mkdir ${OBJDIR}
85 cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoconf 83 cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoconf
86 cd ${WRKSRC}${MOZILLA_DIR} && ${SETENV} ${CONFIGURE_ENV} autoconf 84 cd ${WRKSRC}${MOZILLA_DIR} && ${SETENV} ${CONFIGURE_ENV} autoconf
87 cd ${WRKSRC}${MOZILLA_DIR}/js/src && ${SETENV} ${CONFIGURE_ENV} autoconf 85 cd ${WRKSRC}${MOZILLA_DIR}/js/src && ${SETENV} ${CONFIGURE_ENV} autoconf
88 touch ${WRKSRC}/.mozconfig 86 touch ${WRKSRC}/.mozconfig
89 87
90do-build: 88do-build:
91# XXX for some reason it doesn't work unless -j is explicitly specified 89# XXX for some reason it doesn't work unless -j is explicitly specified
92 ${_ULIMIT_CMD} cd ${WRKSRC}/${OBJDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -j${MAKE_JOBS:U1} 90 ${_ULIMIT_CMD} cd ${WRKSRC}/${OBJDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -j${MAKE_JOBS:U1}
93 91
94MOZILLA= thunderbird 92MOZILLA= thunderbird

cvs diff -r1.1 -r1.2 pkgsrc/mail/thunderbird68/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/thunderbird68/Makefile 2020/09/03 20:22:25 1.1
+++ pkgsrc/mail/thunderbird68/Makefile 2020/12/26 10:35:16 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.1 2020/09/03 20:22:25 ryoon Exp $ 1# $NetBSD: Makefile,v 1.2 2020/12/26 10:35:16 nia Exp $
2 2
3DISTNAME= thunderbird-${TB_VER}.source 3DISTNAME= thunderbird-${TB_VER}.source
4PKGNAME= thunderbird68-${TB_VER} 4PKGNAME= thunderbird68-${TB_VER}
5TB_VER= 68.12.0 5TB_VER= 68.12.0
6CATEGORIES= mail 6CATEGORIES= mail
7MASTER_SITES= ${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/} 7MASTER_SITES= ${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/}
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.thunderbird.net/en-US/ 11HOMEPAGE= https://www.thunderbird.net/en-US/
12COMMENT= Organize, secure and customize your mail 12COMMENT= Organize, secure and customize your mail
13LICENSE= mpl-1.1 13LICENSE= mpl-1.1
14 14
@@ -29,28 +29,26 @@ CONFIGURE_ARGS+= --with-app-name=${MOZIL @@ -29,28 +29,26 @@ CONFIGURE_ARGS+= --with-app-name=${MOZIL
29 29
30NOT_PAX_MPROTECT_SAFE+= lib/${MOZILLA_NAME}/${MOZILLA_NAME} 30NOT_PAX_MPROTECT_SAFE+= lib/${MOZILLA_NAME}/${MOZILLA_NAME}
31NOT_PAX_MPROTECT_SAFE+= lib/${MOZILLA_NAME}/${MOZILLA_NAME}-bin 31NOT_PAX_MPROTECT_SAFE+= lib/${MOZILLA_NAME}/${MOZILLA_NAME}-bin
32 32
33LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${MOZILLA_NAME} 33LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${MOZILLA_NAME}
34 34
35.include "../../mk/bsd.prefs.mk" 35.include "../../mk/bsd.prefs.mk"
36 36
37CHECK_WRKREF_SKIP+= lib/${MOZILLA_NAME}/chrome/toolkit/content/global/buildconfig.html 37CHECK_WRKREF_SKIP+= lib/${MOZILLA_NAME}/chrome/toolkit/content/global/buildconfig.html
38CHECK_WRKREF_SKIP+= lib/${MOZILLA_NAME}/chrome/messenger/content/messenger/buildconfig.html 38CHECK_WRKREF_SKIP+= lib/${MOZILLA_NAME}/chrome/messenger/content/messenger/buildconfig.html
39 39
40post-extract: 40post-extract:
41 ${CP} ${FILESDIR}/cubeb_sun.c ${WRKSRC}/media/libcubeb/src/cubeb_sun.c 41 ${CP} ${FILESDIR}/cubeb_sun.c ${WRKSRC}/media/libcubeb/src/cubeb_sun.c
42 mv ${WRKSRC}${MOZILLA_DIR}/gfx/ycbcr/yuv_row_arm.s \ 
43 ${WRKSRC}${MOZILLA_DIR}/gfx/ycbcr/yuv_row_arm.S 
44 42
45pre-configure: 43pre-configure:
46 cd ${WRKSRC} && mkdir ${OBJDIR} 44 cd ${WRKSRC} && mkdir ${OBJDIR}
47 cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoconf 45 cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoconf
48 cd ${WRKSRC}${MOZILLA_DIR} && ${SETENV} ${CONFIGURE_ENV} autoconf 46 cd ${WRKSRC}${MOZILLA_DIR} && ${SETENV} ${CONFIGURE_ENV} autoconf
49 cd ${WRKSRC}${MOZILLA_DIR}/js/src && ${SETENV} ${CONFIGURE_ENV} autoconf 47 cd ${WRKSRC}${MOZILLA_DIR}/js/src && ${SETENV} ${CONFIGURE_ENV} autoconf
50 touch ${WRKSRC}/.mozconfig 48 touch ${WRKSRC}/.mozconfig
51 49
52do-build: 50do-build:
53# XXX for some reason it doesn't work unless -j is explicitly specified 51# XXX for some reason it doesn't work unless -j is explicitly specified
54 ${_ULIMIT_CMD} cd ${WRKSRC}/${OBJDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -j${MAKE_JOBS:U1} 52 ${_ULIMIT_CMD} cd ${WRKSRC}/${OBJDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -j${MAKE_JOBS:U1}
55 53
56MOZILLA= thunderbird 54MOZILLA= thunderbird

cvs diff -r1.460 -r1.461 pkgsrc/www/firefox/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox/Makefile 2020/12/17 09:53:15 1.460
+++ pkgsrc/www/firefox/Makefile 2020/12/26 10:35:16 1.461
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.460 2020/12/17 09:53:15 ryoon Exp $ 1# $NetBSD: Makefile,v 1.461 2020/12/26 10:35:16 nia Exp $
2 2
3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
4MOZ_BRANCH= 84.0 4MOZ_BRANCH= 84.0
5MOZ_BRANCH_MINOR=  5MOZ_BRANCH_MINOR=
6 6
7DISTNAME= firefox-${FIREFOX_VER}.source 7DISTNAME= firefox-${FIREFOX_VER}.source
8PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//} 8PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//}
9CATEGORIES= www 9CATEGORIES= www
10MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} 10MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
11EXTRACT_SUFX= .tar.xz 11EXTRACT_SUFX= .tar.xz
12 12
13MAINTAINER= ryoon@NetBSD.org 13MAINTAINER= ryoon@NetBSD.org
14HOMEPAGE= https://www.mozilla.org/en-US/firefox/ 14HOMEPAGE= https://www.mozilla.org/en-US/firefox/
@@ -89,29 +89,26 @@ MOZILLA_NAME= Browser @@ -89,29 +89,26 @@ MOZILLA_NAME= Browser
89# patch-third__party_rust_getrandom_src_lib.rs 89# patch-third__party_rust_getrandom_src_lib.rs
90#CKSUMS+= 0e52f6bde42d7bb05c297ce1c25b9879d61b28caba98f6226a152bff538db6c2 90#CKSUMS+= 0e52f6bde42d7bb05c297ce1c25b9879d61b28caba98f6226a152bff538db6c2
91#CKSUMS+= 394425b4ba03c21c494e64d993678f7014575b1e3d590b9ee452b5c2d83ec4ac 91#CKSUMS+= 394425b4ba03c21c494e64d993678f7014575b1e3d590b9ee452b5c2d83ec4ac
92 92
93#SUBST_CLASSES+= cksum 93#SUBST_CLASSES+= cksum
94#SUBST_STAGE.cksum= pre-configure 94#SUBST_STAGE.cksum= pre-configure
95#.for crate in ${CKSUM_CRATES} 95#.for crate in ${CKSUM_CRATES}
96#SUBST_FILES.cksum+= ${crate}/.cargo-checksum.json 96#SUBST_FILES.cksum+= ${crate}/.cargo-checksum.json
97#.endfor 97#.endfor
98#.for from to in ${CKSUMS} 98#.for from to in ${CKSUMS}
99#SUBST_SED.cksum+= -e 's,${from},${to},g' 99#SUBST_SED.cksum+= -e 's,${from},${to},g'
100#.endfor 100#.endfor
101 101
102post-extract: 
103 mv ${WRKSRC}/gfx/ycbcr/yuv_row_arm.s ${WRKSRC}/gfx/ycbcr/yuv_row_arm.S 
104 
105pre-configure: 102pre-configure:
106 cd ${WRKSRC} && autoconf 103 cd ${WRKSRC} && autoconf
107 cd ${WRKSRC}/js/src && autoconf 104 cd ${WRKSRC}/js/src && autoconf
108 cd ${WRKSRC} && mkdir ${OBJDIR} 105 cd ${WRKSRC} && mkdir ${OBJDIR}
109 cd ${WRKSRC}/${OBJDIR} && touch old-configure.vars 106 cd ${WRKSRC}/${OBJDIR} && touch old-configure.vars
110 # Do not fetch Rust Cargo file via network during build 107 # Do not fetch Rust Cargo file via network during build
111 108
112post-build: 109post-build:
113 ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \ 110 ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \
114 -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \ 111 -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \
115 -e 's|@FIREFOX_ICON@|${MOZILLA}.png|g' \ 112 -e 's|@FIREFOX_ICON@|${MOZILLA}.png|g' \
116 < ${FILESDIR}/desktop.in \ 113 < ${FILESDIR}/desktop.in \
117 > ${WRKDIR}/desktop 114 > ${WRKDIR}/desktop

cvs diff -r1.36 -r1.37 pkgsrc/www/firefox68/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox68/Attic/Makefile 2020/11/05 09:09:20 1.36
+++ pkgsrc/www/firefox68/Attic/Makefile 2020/12/26 10:35:16 1.37
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.36 2020/11/05 09:09:20 ryoon Exp $ 1# $NetBSD: Makefile,v 1.37 2020/12/26 10:35:16 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= 2 9PKGREVISION= 2
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
@@ -64,27 +64,26 @@ CHECK_INTERPRETER_SKIP+= lib/firefox-sdk @@ -64,27 +64,26 @@ CHECK_INTERPRETER_SKIP+= lib/firefox-sdk
64 64
65CHECK_WRKREF_SKIP+= lib/${MOZILLA}/chrome/toolkit/content/global/buildconfig.html 65CHECK_WRKREF_SKIP+= lib/${MOZILLA}/chrome/toolkit/content/global/buildconfig.html
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 mv ${WRKSRC}/gfx/ycbcr/yuv_row_arm.s ${WRKSRC}/gfx/ycbcr/yuv_row_arm.S 
78 77
79pre-configure: 78pre-configure:
80 cd ${WRKSRC} && autoconf 79 cd ${WRKSRC} && autoconf
81 cd ${WRKSRC}/js/src && autoconf 80 cd ${WRKSRC}/js/src && autoconf
82 cd ${WRKSRC} && mkdir ${OBJDIR} 81 cd ${WRKSRC} && mkdir ${OBJDIR}
83 cd ${WRKSRC}/${OBJDIR} && touch old-configure.vars 82 cd ${WRKSRC}/${OBJDIR} && touch old-configure.vars
84 83
85post-build: 84post-build:
86 ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \ 85 ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \
87 -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \ 86 -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \
88 -e 's|@FIREFOX_ICON@|${MOZILLA}.png|g' \ 87 -e 's|@FIREFOX_ICON@|${MOZILLA}.png|g' \
89 < ${FILESDIR}/desktop.in \ 88 < ${FILESDIR}/desktop.in \
90 > ${WRKDIR}/desktop 89 > ${WRKDIR}/desktop

cvs diff -r1.14 -r1.15 pkgsrc/www/firefox78/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox78/Attic/Makefile 2020/12/17 13:24:30 1.14
+++ pkgsrc/www/firefox78/Attic/Makefile 2020/12/26 10:35:16 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.14 2020/12/17 13:24:30 nia Exp $ 1# $NetBSD: Makefile,v 1.15 2020/12/26 10:35:16 nia Exp $
2 2
3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
4MOZ_BRANCH= 78.6 4MOZ_BRANCH= 78.6
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-/firefox78-/} 8PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//:S/firefox-/firefox78-/}
9CATEGORIES= www 9CATEGORIES= www
10MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} 10MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
11EXTRACT_SUFX= .tar.xz 11EXTRACT_SUFX= .tar.xz
12 12
13MAINTAINER= ryoon@NetBSD.org 13MAINTAINER= ryoon@NetBSD.org
14HOMEPAGE= https://www.mozilla.org/en-US/firefox/ 14HOMEPAGE= https://www.mozilla.org/en-US/firefox/
@@ -88,29 +88,26 @@ CKSUM_CRATES+= third_party/rust/getrando @@ -88,29 +88,26 @@ CKSUM_CRATES+= third_party/rust/getrando
88# patch-third__party_rust_getrandom_src_lib.rs 88# patch-third__party_rust_getrandom_src_lib.rs
89CKSUMS+= 0e52f6bde42d7bb05c297ce1c25b9879d61b28caba98f6226a152bff538db6c2 89CKSUMS+= 0e52f6bde42d7bb05c297ce1c25b9879d61b28caba98f6226a152bff538db6c2
90CKSUMS+= 394425b4ba03c21c494e64d993678f7014575b1e3d590b9ee452b5c2d83ec4ac 90CKSUMS+= 394425b4ba03c21c494e64d993678f7014575b1e3d590b9ee452b5c2d83ec4ac
91 91
92SUBST_CLASSES+= cksum 92SUBST_CLASSES+= cksum
93SUBST_STAGE.cksum= pre-configure 93SUBST_STAGE.cksum= pre-configure
94.for crate in ${CKSUM_CRATES} 94.for crate in ${CKSUM_CRATES}
95SUBST_FILES.cksum+= ${crate}/.cargo-checksum.json 95SUBST_FILES.cksum+= ${crate}/.cargo-checksum.json
96.endfor 96.endfor
97.for from to in ${CKSUMS} 97.for from to in ${CKSUMS}
98SUBST_SED.cksum+= -e 's,${from},${to},g' 98SUBST_SED.cksum+= -e 's,${from},${to},g'
99.endfor 99.endfor
100 100
101post-extract: 
102 mv ${WRKSRC}/gfx/ycbcr/yuv_row_arm.s ${WRKSRC}/gfx/ycbcr/yuv_row_arm.S 
103 
104pre-configure: 101pre-configure:
105 cd ${WRKSRC} && autoconf 102 cd ${WRKSRC} && autoconf
106 cd ${WRKSRC}/js/src && autoconf 103 cd ${WRKSRC}/js/src && autoconf
107 cd ${WRKSRC} && mkdir ${OBJDIR} 104 cd ${WRKSRC} && mkdir ${OBJDIR}
108 cd ${WRKSRC}/${OBJDIR} && touch old-configure.vars 105 cd ${WRKSRC}/${OBJDIR} && touch old-configure.vars
109 # Do not fetch Rust Cargo file via network during build 106 # Do not fetch Rust Cargo file via network during build
110 107
111post-build: 108post-build:
112 ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \ 109 ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \
113 -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \ 110 -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \
114 -e 's|@FIREFOX_ICON@|${MOZILLA}.png|g' \ 111 -e 's|@FIREFOX_ICON@|${MOZILLA}.png|g' \
115 < ${FILESDIR}/desktop.in \ 112 < ${FILESDIR}/desktop.in \
116 > ${WRKDIR}/desktop 113 > ${WRKDIR}/desktop

cvs diff -r1.225 -r1.226 pkgsrc/www/seamonkey/Makefile (expand / switch to unified diff)

--- pkgsrc/www/seamonkey/Makefile 2020/11/05 09:09:22 1.225
+++ pkgsrc/www/seamonkey/Makefile 2020/12/26 10:35:16 1.226
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.225 2020/11/05 09:09:22 ryoon Exp $ 1# $NetBSD: Makefile,v 1.226 2020/12/26 10:35:16 nia Exp $
2 2
3DISTNAME= seamonkey-${SM_VER}.source 3DISTNAME= seamonkey-${SM_VER}.source
4PKGNAME= seamonkey-${SM_VER:S/b/beta/} 4PKGNAME= seamonkey-${SM_VER:S/b/beta/}
5PKGREVISION= 1 5PKGREVISION= 1
6SM_VER= 2.53.4 6SM_VER= 2.53.4
7CATEGORIES= www 7CATEGORIES= www
8MASTER_SITES= ${MASTER_SITE_MOZILLA:=seamonkey/releases/${SM_VER}/source/} 8MASTER_SITES= ${MASTER_SITE_MOZILLA:=seamonkey/releases/${SM_VER}/source/}
9EXTRACT_SUFX= .tar.xz 9EXTRACT_SUFX= .tar.xz
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://www.seamonkey-project.org/ 12HOMEPAGE= https://www.seamonkey-project.org/
13COMMENT= All-in-one Internet application suite 13COMMENT= All-in-one Internet application suite
14LICENSE= mpl-2.0 14LICENSE= mpl-2.0
@@ -66,27 +66,26 @@ SUBST_CLASSES+= cksum @@ -66,27 +66,26 @@ SUBST_CLASSES+= cksum
66SUBST_STAGE.cksum= pre-configure 66SUBST_STAGE.cksum= pre-configure
67.for crate in ${CKSUM_CRATES} 67.for crate in ${CKSUM_CRATES}
68SUBST_FILES.cksum+= ${crate}/.cargo-checksum.json 68SUBST_FILES.cksum+= ${crate}/.cargo-checksum.json
69.endfor 69.endfor
70.for from to in ${CKSUMS} 70.for from to in ${CKSUMS}
71SUBST_SED.cksum+= -e 's,${from},${to},g' 71SUBST_SED.cksum+= -e 's,${from},${to},g'
72.endfor 72.endfor
73 73
74INSTALLATION_DIRS+= lib/seamonkey/extensions 74INSTALLATION_DIRS+= lib/seamonkey/extensions
75INSTALLATION_DIRS+= share/applications 75INSTALLATION_DIRS+= share/applications
76INSTALLATION_DIRS+= share/icons/hicolor/32x32/apps 76INSTALLATION_DIRS+= share/icons/hicolor/32x32/apps
77 77
78post-extract: 78post-extract:
79 mv ${WRKSRC}/mozilla/gfx/ycbcr/yuv_row_arm.s ${WRKSRC}/mozilla/gfx/ycbcr/yuv_row_arm.S 
80 ${CP} ${FILESDIR}/cubeb_sun.c ${WRKSRC}/mozilla/media/libcubeb/src 79 ${CP} ${FILESDIR}/cubeb_sun.c ${WRKSRC}/mozilla/media/libcubeb/src
81 80
82pre-configure: 81pre-configure:
83 cd ${WRKSRC} && mkdir ${OBJDIR} 82 cd ${WRKSRC} && mkdir ${OBJDIR}
84 cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoconf 83 cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoconf
85 cd ${WRKSRC}/mozilla && ${SETENV} ${CONFIGURE_ENV} autoconf 84 cd ${WRKSRC}/mozilla && ${SETENV} ${CONFIGURE_ENV} autoconf
86 cd ${WRKSRC}/mozilla/js/src && ${SETENV} ${CONFIGURE_ENV} autoconf 85 cd ${WRKSRC}/mozilla/js/src && ${SETENV} ${CONFIGURE_ENV} autoconf
87 ${SED} -e 's/@MOZ_APP_DISPLAYNAME@/SeaMonkey/g' \ 86 ${SED} -e 's/@MOZ_APP_DISPLAYNAME@/SeaMonkey/g' \
88 -e 's/@MOZ_APP_NAME@/seamonkey/g' \ 87 -e 's/@MOZ_APP_NAME@/seamonkey/g' \
89 ${WRKSRC}/mozilla/toolkit/mozapps/installer/linux/rpm/mozilla.desktop > \ 88 ${WRKSRC}/mozilla/toolkit/mozapps/installer/linux/rpm/mozilla.desktop > \
90 ${WRKDIR}/seamonkey.desktop 89 ${WRKDIR}/seamonkey.desktop
91# If there is no .mozconfig, codegen.pp target fails. 90# If there is no .mozconfig, codegen.pp target fails.
92# touch ${WRKSRC}/.mozconfig 91# touch ${WRKSRC}/.mozconfig