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: wiz
Date: Fri Dec 27 11:15:54 UTC 2024
Modified Files:
pkgsrc/devel/git-gitk: Makefile
Log Message:
git-gitk: do previously differently and for more binaries
Ride bump.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 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.7 pkgsrc/devel/git-gitk/Makefile:1.8
--- pkgsrc/devel/git-gitk/Makefile:1.7 Fri Dec 27 11:09:00 2024
+++ pkgsrc/devel/git-gitk/Makefile Fri Dec 27 11:15:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2024/12/27 11:09:00 riastradh Exp $
+# $NetBSD: Makefile,v 1.8 2024/12/27 11:15:54 wiz Exp $
PKGNAME= git-gitk-${GIT_VERSION}
PKGREVISION= 1
@@ -13,12 +13,21 @@ DEPENDS+= git-base>=1.7.12nb1:../../deve
BUILD_DIRS= git-gui gitk-git
INSTALL_DIRS= ${BUILD_DIRS}
MAKE_ENV+= prefix=${PREFIX}
+MAKE_ENV+= TCLTK_PATH=${WISH:Q}
USE_TOOLS+= wish:run
CONFIGURE_ARGS+= --with-tcltk=${WISH:Q}
INSTALLATION_DIRS+= bin
+# not substituted even when using --with-tcltk and TCLTK_PATH
+SUBST_CLASSES+= wish
+SUBST_FILES.wish+= git-gui/git-gui--askpass
+SUBST_SED.wish+= -e "s,exec wish,exec ${WISH:Q},"
+SUBST_SED.wish+= -e "s,exec 'wish',exec ${WISH:Q},"
+SUBST_STAGE.wish= post-configure
+SUBST_MESSAGE.wish= Fixing path to wish binary.
+
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "Darwin" && exists(/System/Library/Frameworks/Tk.framework)
@@ -37,17 +46,6 @@ 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