CVS commit: pkgsrc/sysutils/szyszka

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

Module Name:    pkgsrc
Committed By:   abs
Date:           Mon Aug 14 08:41:06 UTC 2023

Modified Files:
        pkgsrc/sysutils/szyszka: Makefile
        pkgsrc/sysutils/szyszka/files: szyszka.sh

Log Message:
Correctly substitute PREFIX in files wrapper


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/szyszka/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/szyszka/files/szyszka.sh

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

Modified files:

Index: pkgsrc/sysutils/szyszka/Makefile
diff -u pkgsrc/sysutils/szyszka/Makefile:1.2 pkgsrc/sysutils/szyszka/Makefile:1.3
--- pkgsrc/sysutils/szyszka/Makefile:1.2        Fri Jun  9 19:44:13 2023
+++ pkgsrc/sysutils/szyszka/Makefile    Mon Aug 14 08:41:06 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2023/06/09 19:44:13 abs Exp $
+# $NetBSD: Makefile,v 1.3 2023/08/14 08:41:06 abs Exp $
 
 DISTNAME=      szyszka-3.0.0
 PKGREVISION=   1
@@ -18,16 +18,24 @@ RUSTFLAGS+= -C link-arg=${COMPILER_RPATH
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.MesaLib}/lib
 RUSTFLAGS+=    -C link-arg=-L${BUILDLINK_PREFIX.MesaLib}/lib
 
+SUBST_CLASSES+=                paths
+SUBST_STAGE.paths=     pre-configure
+SUBST_FILES.paths=     ../szyszka.sh
+SUBST_VARS.paths=      PREFIX
+
 INSTALLATION_DIRS=     bin libexec/szyszka
 
 .include "../../mk/bsd.prefs.mk"
 
+post-extract:
+       ${CP} ${FILESDIR}/szyszka.sh ${WRKDIR}/szyszka.sh
+
 # This is a workaround for PR#57445. When resolved this do-install and wrapper
 # should # be removed and the binary just installed into PREFIX/bin
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/szyszka ${DESTDIR}${PREFIX}/libexec/szyszka
 .if ${OPSYS} == "NetBSD" && ${X11_TYPE} == "native"
-       ${INSTALL_SCRIPT} ${FILESDIR}/szyszka.sh ${DESTDIR}${PREFIX}/bin/szyszka
+       ${INSTALL_SCRIPT} ${WRKDIR}/szyszka.sh ${DESTDIR}${PREFIX}/bin/szyszka
 .else
        ${ECHO} '#!/bin/sh' > ${DESTDIR}${PREFIX}/bin/szyszka
        ${ECHO} '${PREFIX}/libexec/szyszka/szyszka "$$@"' >> \

Index: pkgsrc/sysutils/szyszka/files/szyszka.sh
diff -u pkgsrc/sysutils/szyszka/files/szyszka.sh:1.3 pkgsrc/sysutils/szyszka/files/szyszka.sh:1.4
--- pkgsrc/sysutils/szyszka/files/szyszka.sh:1.3        Mon Aug  7 19:37:12 2023
+++ pkgsrc/sysutils/szyszka/files/szyszka.sh    Mon Aug 14 08:41:06 2023
@@ -7,4 +7,4 @@ if [ -f /usr/X11R7/lib/libEGL.so ] && [ 
     echo "Applying libEGL LD_PRELOAD workaround for NetBSD" >&2
     export LD_PRELOAD=/usr/X11R7/lib/libEGL.so
 fi
-exec /usr/pkg/libexec/szyszka/szyszka "$@"
+exec @PREFIX@/libexec/szyszka/szyszka "$@"