Fri Jun 18 19:35:13 2021 UTC ()
seamonkey: use autoconf-2.13 explicitly


(nia)
diff -r1.236 -r1.237 pkgsrc/www/seamonkey/Makefile
cvs diff -r1.236 -r1.237 pkgsrc/www/seamonkey/Makefile (expand / switch to unified diff)

--- pkgsrc/www/seamonkey/Makefile 2021/06/02 15:39:55 1.236
+++ pkgsrc/www/seamonkey/Makefile 2021/06/18 19:35:13 1.237
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.236 2021/06/02 15:39:55 wiz Exp $ 1# $NetBSD: Makefile,v 1.237 2021/06/18 19:35:13 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= 4 5PKGREVISION= 4
6SM_VER= 2.53.6 6SM_VER= 2.53.6
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
@@ -77,29 +77,29 @@ INSTALLATION_DIRS+= lib/seamonkey/extens @@ -77,29 +77,29 @@ INSTALLATION_DIRS+= lib/seamonkey/extens
77INSTALLATION_DIRS+= share/applications 77INSTALLATION_DIRS+= share/applications
78INSTALLATION_DIRS+= share/icons/hicolor/32x32/apps 78INSTALLATION_DIRS+= share/icons/hicolor/32x32/apps
79 79
80# error: Cannot set `RUSTC_BOOTSTRAP=1` from build script of `packed_simd v0.3.4 (https://github.com/hsivonen/packed_simd?rev=0917fe780032a6bbb23d71be545f9c1834128d75#0917fe78)`. 80# error: Cannot set `RUSTC_BOOTSTRAP=1` from build script of `packed_simd v0.3.4 (https://github.com/hsivonen/packed_simd?rev=0917fe780032a6bbb23d71be545f9c1834128d75#0917fe78)`.
81# note: Crates cannot set `RUSTC_BOOTSTRAP` themselves, as doing so would subvert the stability guarantees of Rust for your project. 81# note: Crates cannot set `RUSTC_BOOTSTRAP` themselves, as doing so would subvert the stability guarantees of Rust for your project.
82# help: If you're sure you want to do this in your project, set the environment variable `RUSTC_BOOTSTRAP=packed_simd` before running cargo instead. 82# help: If you're sure you want to do this in your project, set the environment variable `RUSTC_BOOTSTRAP=packed_simd` before running cargo instead.
83MAKE_ENV+= RUSTC_BOOTSTRAP="packed_simd,encoding_rs" 83MAKE_ENV+= RUSTC_BOOTSTRAP="packed_simd,encoding_rs"
84 84
85post-extract: 85post-extract:
86 ${CP} ${FILESDIR}/cubeb_sun.c ${WRKSRC}/${MOZILLA_DIR}/media/libcubeb/src 86 ${CP} ${FILESDIR}/cubeb_sun.c ${WRKSRC}/${MOZILLA_DIR}/media/libcubeb/src
87 87
88pre-configure: 88pre-configure:
89 cd ${WRKSRC} && mkdir ${OBJDIR} 89 cd ${WRKSRC} && mkdir ${OBJDIR}
90 cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoconf 90 cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoconf-2.13
91## cd ${WRKSRC}/${MOZILLA_DIR} && ${SETENV} ${CONFIGURE_ENV} autoconf 91## cd ${WRKSRC}/${MOZILLA_DIR} && ${SETENV} ${CONFIGURE_ENV} autoconf-2.13
92# cd ${WRKSRC}/${MOZILLA_DIR}/js/src && ${SETENV} ${CONFIGURE_ENV} autoconf 92# cd ${WRKSRC}/${MOZILLA_DIR}/js/src && ${SETENV} ${CONFIGURE_ENV} autoconf-2.13
93 ${SED} -e 's/@MOZ_APP_DISPLAYNAME@/SeaMonkey/g' \ 93 ${SED} -e 's/@MOZ_APP_DISPLAYNAME@/SeaMonkey/g' \
94 -e 's/@MOZ_APP_NAME@/seamonkey/g' \ 94 -e 's/@MOZ_APP_NAME@/seamonkey/g' \
95 ${WRKSRC}/${MOZILLA_DIR}/toolkit/mozapps/installer/linux/rpm/mozilla.desktop > \ 95 ${WRKSRC}/${MOZILLA_DIR}/toolkit/mozapps/installer/linux/rpm/mozilla.desktop > \
96 ${WRKDIR}/seamonkey.desktop 96 ${WRKDIR}/seamonkey.desktop
97## If there is no .mozconfig, codegen.pp target fails. 97## If there is no .mozconfig, codegen.pp target fails.
98## touch ${WRKSRC}/.mozconfig 98## touch ${WRKSRC}/.mozconfig
99 99
100# XXX: For PREFIX 100# XXX: For PREFIX
101#.include "../../mk/bsd.pkg.use.mk" 101#.include "../../mk/bsd.pkg.use.mk"
102#do-configure: 102#do-configure:
103# echo mk_add_options MOZ_OBJDIR="${OBJDIR}" > ${WRKSRC}/comm/.mozconfig 103# echo mk_add_options MOZ_OBJDIR="${OBJDIR}" > ${WRKSRC}/comm/.mozconfig
104#.for i in ${CONFIGURE_ARGS} 104#.for i in ${CONFIGURE_ARGS}
105# echo ac_add_options $i >> ${WRKSRC}/comm/.mozconfig 105# echo ac_add_options $i >> ${WRKSRC}/comm/.mozconfig