pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/devel/git-gitk



Module Name:    pkgsrc
Committed By:   riastradh
Date:           Fri Dec 27 11:09:01 UTC 2024

Modified Files:
        pkgsrc/devel/git-gitk: Makefile

Log Message:
devel/git-gitk: Fix interpreter for bin/gitk.

This is not a #! interpreter directly -- for some reason it uses:

        #!/bin/sh
        # single-line sh comment, multi-line tcl comment \
        exec wish "$0" -- ${1+"$@"}

So we have to do some more work than REPLACE_INTERPRETER to fix the
path to wish.

PR pkg/58940: devel/git-gitk assumes wish is in PATH


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/git-gitk/Makefile

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

Modified files:

Index: pkgsrc/devel/git-gitk/Makefile
diff -u pkgsrc/devel/git-gitk/Makefile:1.6 pkgsrc/devel/git-gitk/Makefile:1.7
--- pkgsrc/devel/git-gitk/Makefile:1.6  Wed Jun 14 10:30:11 2023
+++ pkgsrc/devel/git-gitk/Makefile      Fri Dec 27 11:09:00 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2023/06/14 10:30:11 riastradh Exp $
+# $NetBSD: Makefile,v 1.7 2024/12/27 11:09:00 riastradh Exp $
 
 PKGNAME=       git-gitk-${GIT_VERSION}
+PKGREVISION=   1
 COMMENT=       GIT Tree History Storage Tool (gitk)
 
 CONFLICTS+=    git-base<1.7.12nb1
@@ -36,6 +37,17 @@ CONFIGURE_ENV.NetBSD+=       ac_cv_fread_reads
 CONFIGURE_ENV.NetBSD+= ac_cv_snprintf_returns_bogus=no
 .endif
 
+# Fix the exec path in bin/gitk:
+#
+#      #!/bin/sh
+#      # single-line sh comment, multi-line tcl comment \
+#      exec wish "$0" -- ${1+"$@"}
+#
+SUBST_CLASSES+=                wish
+SUBST_STAGE.wish=      post-build
+SUBST_FILES.wish+=     gitk-git/gitk-wish
+SUBST_SED.wish+=       -e '\|^\#! */bin/sh|,+2s|^exec wish |exec ${WISH} |'
+
 .include "../../devel/git/Makefile.common"
 
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index