CVS commit: pkgsrc/www/firefox

["David Brownlee" <abs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   abs
Date:           Wed Aug 16 10:41:36 UTC 2023

Modified Files:
        pkgsrc/www/firefox: Makefile
        pkgsrc/www/firefox/files: firefox.sh

Log Message:
Substitute PREFIX in NetBSD wrapper

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


To generate a diff of this commit:
cvs rdiff -u -r1.565 -r1.566 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/firefox/files/firefox.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox/Makefile
diff -u pkgsrc/www/firefox/Makefile:1.565 pkgsrc/www/firefox/Makefile:1.566
--- pkgsrc/www/firefox/Makefile:1.565   Mon Aug 14 05:25:29 2023
+++ pkgsrc/www/firefox/Makefile Wed Aug 16 10:41:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.565 2023/08/14 05:25:29 wiz Exp $
+# $NetBSD: Makefile,v 1.566 2023/08/16 10:41:35 abs Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            116.0
@@ -88,6 +88,11 @@ SUBST_MESSAGE.dfly_malloc_h= Dont includ
 SUBST_SED.dfly_malloc_h=       -e 's,HAVE_MALLOC_H,HAVE_MALLOC_H \&\& !defined(__DragonFly__),g'
 SUBST_FILES.dfly_malloc_h+=    media/ffvpx/libavutil/mem.c
 
+SUBST_CLASSES+=                        paths
+SUBST_STAGE.paths=             pre-configure
+SUBST_FILES.paths=             ../firefox.sh
+SUBST_VARS.paths=              PREFIX MOZILLA
+
 .include "mozilla-common.mk"
 .include "options.mk"
 
@@ -166,9 +171,12 @@ post-build:
 
 INSTALLATION_DIRS+=    share/applications
 
+post-extract:
+       ${CP} ${FILESDIR}/firefox.sh ${WRKDIR}/firefox.sh
+
 post-install:
 .if ${OPSYS} == "NetBSD" && ${X11_TYPE} == "native"
-       ${INSTALL_SCRIPT} ${FILESDIR}/firefox.sh ${DESTDIR}${PREFIX}/bin/${MOZILLA}
+       ${INSTALL_SCRIPT} ${WRKDIR}/firefox.sh ${DESTDIR}${PREFIX}/bin/${MOZILLA}
 .else
        ${ECHO} '#! /bin/sh' > ${DESTDIR}${PREFIX}/bin/${MOZILLA}
        ${ECHO} '${PREFIX}/lib/${MOZILLA}/${MOZILLA} "$$@"' >> \

Index: pkgsrc/www/firefox/files/firefox.sh
diff -u pkgsrc/www/firefox/files/firefox.sh:1.4 pkgsrc/www/firefox/files/firefox.sh:1.5
--- pkgsrc/www/firefox/files/firefox.sh:1.4     Mon Aug  7 19:37:23 2023
+++ pkgsrc/www/firefox/files/firefox.sh Wed Aug 16 10:41:35 2023
@@ -11,4 +11,4 @@ if [ -f /usr/X11R7/lib/libEGL.so ] && [ 
     # by default, but it's not even worth looking at that on a system without
     # the fixed libGL
 fi
-exec /usr/pkg/lib/firefox/firefox "$@"
+exec @PREFIX@/lib/@MOZILLA@/@MOZILLA@ "$@"