Wed Aug 16 10:41:36 2023 UTC ()
Substitute PREFIX in NetBSD wrapper

Fix my previous workaround for NetBSD GL issue to correctly
substitute PREFIX rather than hard coded /usr/pkg


(abs)
diff -r1.565 -r1.566 pkgsrc/www/firefox/Makefile
diff -r1.4 -r1.5 pkgsrc/www/firefox/files/firefox.sh
cvs diff -r1.565 -r1.566 pkgsrc/www/firefox/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox/Makefile 2023/08/14 05:25:29 1.565
+++ pkgsrc/www/firefox/Makefile 2023/08/16 10:41:35 1.566
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.565 2023/08/14 05:25:29 wiz Exp $ 1# $NetBSD: Makefile,v 1.566 2023/08/16 10:41:35 abs Exp $
2 2
3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
4MOZ_BRANCH= 116.0 4MOZ_BRANCH= 116.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//}
9PKGREVISION= 1 9PKGREVISION= 1
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
@@ -78,26 +78,31 @@ NOT_PAX_MPROTECT_SAFE+= lib/${PKGBASE}/f @@ -78,26 +78,31 @@ NOT_PAX_MPROTECT_SAFE+= lib/${PKGBASE}/f
78BUILDLINK_TRANSFORM.SunOS+= rm:-fdata-sections 78BUILDLINK_TRANSFORM.SunOS+= rm:-fdata-sections
79BUILDLINK_TRANSFORM.SunOS+= rm:-ffunction-sections 79BUILDLINK_TRANSFORM.SunOS+= rm:-ffunction-sections
80BUILDLINK_TRANSFORM.SunOS+= rm:-pie 80BUILDLINK_TRANSFORM.SunOS+= rm:-pie
81 81
82# Workaround for https://bugs.llvm.org/show_bug.cgi?id=46366 82# Workaround for https://bugs.llvm.org/show_bug.cgi?id=46366
83BUILDLINK_TRANSFORM.NetBSD+= rm:-fexperimental-new-pass-manager 83BUILDLINK_TRANSFORM.NetBSD+= rm:-fexperimental-new-pass-manager
84 84
85SUBST_CLASSES+= dfly_malloc_h 85SUBST_CLASSES+= dfly_malloc_h
86SUBST_STAGE.dfly_malloc_h= pre-configure 86SUBST_STAGE.dfly_malloc_h= pre-configure
87SUBST_MESSAGE.dfly_malloc_h= Dont include malloc.h on dragonflybsd 87SUBST_MESSAGE.dfly_malloc_h= Dont include malloc.h on dragonflybsd
88SUBST_SED.dfly_malloc_h= -e 's,HAVE_MALLOC_H,HAVE_MALLOC_H \&\& !defined(__DragonFly__),g' 88SUBST_SED.dfly_malloc_h= -e 's,HAVE_MALLOC_H,HAVE_MALLOC_H \&\& !defined(__DragonFly__),g'
89SUBST_FILES.dfly_malloc_h+= media/ffvpx/libavutil/mem.c 89SUBST_FILES.dfly_malloc_h+= media/ffvpx/libavutil/mem.c
90 90
 91SUBST_CLASSES+= paths
 92SUBST_STAGE.paths= pre-configure
 93SUBST_FILES.paths= ../firefox.sh
 94SUBST_VARS.paths= PREFIX MOZILLA
 95
91.include "mozilla-common.mk" 96.include "mozilla-common.mk"
92.include "options.mk" 97.include "options.mk"
93 98
94CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/header.py 99CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/header.py
95CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/typelib.py 100CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/typelib.py
96CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/xpidl.py 101CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/xpidl.py
97CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/xpt.py 102CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/xpt.py
98 103
99CHECK_WRKREF_SKIP+= lib/${MOZILLA}/omni.ja 104CHECK_WRKREF_SKIP+= lib/${MOZILLA}/omni.ja
100 105
101MOZILLA= ${PKGBASE} 106MOZILLA= ${PKGBASE}
102 107
103.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding) 108.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
@@ -156,29 +161,32 @@ pre-patch: @@ -156,29 +161,32 @@ pre-patch:
156 do \ 161 do \
157 ${AWK} -f ${FILESDIR}/replace-moz.build.awk $$f > $$f.new; mv $$f.new $$f ; \ 162 ${AWK} -f ${FILESDIR}/replace-moz.build.awk $$f > $$f.new; mv $$f.new $$f ; \
158 done 163 done
159 164
160post-build: 165post-build:
161 ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \ 166 ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \
162 -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \ 167 -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \
163 -e 's|@FIREFOX_ICON@|${MOZILLA}|g' \ 168 -e 's|@FIREFOX_ICON@|${MOZILLA}|g' \
164 < ${FILESDIR}/desktop.in \ 169 < ${FILESDIR}/desktop.in \
165 > ${WRKDIR}/desktop 170 > ${WRKDIR}/desktop
166 171
167INSTALLATION_DIRS+= share/applications 172INSTALLATION_DIRS+= share/applications
168 173
 174post-extract:
 175 ${CP} ${FILESDIR}/firefox.sh ${WRKDIR}/firefox.sh
 176
169post-install: 177post-install:
170.if ${OPSYS} == "NetBSD" && ${X11_TYPE} == "native" 178.if ${OPSYS} == "NetBSD" && ${X11_TYPE} == "native"
171 ${INSTALL_SCRIPT} ${FILESDIR}/firefox.sh ${DESTDIR}${PREFIX}/bin/${MOZILLA} 179 ${INSTALL_SCRIPT} ${WRKDIR}/firefox.sh ${DESTDIR}${PREFIX}/bin/${MOZILLA}
172.else 180.else
173 ${ECHO} '#! /bin/sh' > ${DESTDIR}${PREFIX}/bin/${MOZILLA} 181 ${ECHO} '#! /bin/sh' > ${DESTDIR}${PREFIX}/bin/${MOZILLA}
174 ${ECHO} '${PREFIX}/lib/${MOZILLA}/${MOZILLA} "$$@"' >> \ 182 ${ECHO} '${PREFIX}/lib/${MOZILLA}/${MOZILLA} "$$@"' >> \
175 ${DESTDIR}${PREFIX}/bin/${MOZILLA} 183 ${DESTDIR}${PREFIX}/bin/${MOZILLA}
176 ${CHMOD} 755 ${DESTDIR}${PREFIX}/bin/${MOZILLA} 184 ${CHMOD} 755 ${DESTDIR}${PREFIX}/bin/${MOZILLA}
177.endif 185.endif
178 ${INSTALL_DATA} ${WRKDIR}/desktop \ 186 ${INSTALL_DATA} ${WRKDIR}/desktop \
179 ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop 187 ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
180.for i in 16 22 24 32 48 64 128 256 188.for i in 16 22 24 32 48 64 128 256
181 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps 189 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps
182 ${INSTALL_DATA} ${WRKSRC}/browser/branding/${MOZILLA_BRANDING}/default${i}.png \ 190 ${INSTALL_DATA} ${WRKSRC}/browser/branding/${MOZILLA_BRANDING}/default${i}.png \
183 ${DESTDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps/${MOZILLA}.png 191 ${DESTDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps/${MOZILLA}.png
184.endfor 192.endfor
cvs diff -r1.4 -r1.5 pkgsrc/www/firefox/files/firefox.sh (expand / switch to unified diff)

--- pkgsrc/www/firefox/files/firefox.sh 2023/08/07 19:37:23 1.4
+++ pkgsrc/www/firefox/files/firefox.sh 2023/08/16 10:41:35 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1#!/bin/sh 1#!/bin/sh
2if [ -f /usr/X11R7/lib/libEGL.so ] && [ -z "$LD_PRELOAD" ] && \ 2if [ -f /usr/X11R7/lib/libEGL.so ] && [ -z "$LD_PRELOAD" ] && \
3 nm /usr/X11R7/lib/libGL.so | grep -Fq "B _glapi_tls_Dispatch"; then 3 nm /usr/X11R7/lib/libGL.so | grep -Fq "B _glapi_tls_Dispatch"; then
4 # Workaround for PR#57445/50277 for netbsd-9 & netbsd-10 pre 2023-08-05 4 # Workaround for PR#57445/50277 for netbsd-9 & netbsd-10 pre 2023-08-05
5 # This may not avoid a crash 100% of the time, but changes at least some 5 # This may not avoid a crash 100% of the time, but changes at least some
6 # cases of 100% crash on startup to "have not yet seen crash on startup" 6 # cases of 100% crash on startup to "have not yet seen crash on startup"
7 echo "Applying libEGL LD_PRELOAD workaround for NetBSD" >&2 7 echo "Applying libEGL LD_PRELOAD workaround for NetBSD" >&2
8 export LD_PRELOAD=/usr/X11R7/lib/libEGL.so 8 export LD_PRELOAD=/usr/X11R7/lib/libEGL.so
9 # Note that there is an _additional_ issue with firefox >= 111 that 9 # Note that there is an _additional_ issue with firefox >= 111 that
10 # needs to be addressed, and that is worked around by disabling webgl 10 # needs to be addressed, and that is worked around by disabling webgl
11 # by default, but it's not even worth looking at that on a system without 11 # by default, but it's not even worth looking at that on a system without
12 # the fixed libGL 12 # the fixed libGL
13fi 13fi
14exec /usr/pkg/lib/firefox/firefox "$@" 14exec @PREFIX@/lib/@MOZILLA@/@MOZILLA@ "$@"