CVS commit: pkgsrc/www/firefox115

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

Module Name:    pkgsrc
Committed By:   abs
Date:           Fri Dec 22 17:11:31 UTC 2023

Modified Files:
        pkgsrc/www/firefox115: Makefile

Log Message:
Fix substitution of $PREFIX/bin/firefox115 for NetBSD native X11

No change for other platforms

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/firefox115/Makefile

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

Modified files:

Index: pkgsrc/www/firefox115/Makefile
diff -u pkgsrc/www/firefox115/Makefile:1.9 pkgsrc/www/firefox115/Makefile:1.10
--- pkgsrc/www/firefox115/Makefile:1.9  Thu Nov 23 12:47:01 2023
+++ pkgsrc/www/firefox115/Makefile      Fri Dec 22 17:11:31 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2023/11/23 12:47:01 ryoon Exp $
+# $NetBSD: Makefile,v 1.10 2023/12/22 17:11:31 abs Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
+PKGREVISION=           1
 MOZ_BRANCH=            115.5
 MOZ_BRANCH_MINOR=      .0esr
 
@@ -87,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"
 
@@ -165,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} "$$@"' >> \