CVS commit: pkgsrc/devel/git-gitk

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Aug 20 08:47:19 UTC 2025

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

Log Message:
git-gitk: switch to tk 9.x

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/git-gitk/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/git-gitk/PLIST

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.10 pkgsrc/devel/git-gitk/Makefile:1.11
--- pkgsrc/devel/git-gitk/Makefile:1.10 Mon Aug 18 19:36:36 2025
+++ pkgsrc/devel/git-gitk/Makefile      Wed Aug 20 08:47:19 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2025/08/18 19:36:36 adam Exp $
+# $NetBSD: Makefile,v 1.11 2025/08/20 08:47:19 wiz Exp $
 
 PKGNAME=       git-gitk-${GIT_VERSION}
+PKGREVISION=   1
 COMMENT=       GIT Tree History Storage Tool (gitk)
 
 CONFLICTS+=    git-base<1.7.12nb1
@@ -10,26 +11,16 @@ SUPERSEDES+=        scmgit-gitk-[0-9]*
 DEPENDS+=      git-base>=1.7.12nb1:../../devel/git-base
 
 BUILD_DIRS=            gitk-git
-INSTALL_DIRS=          ${BUILD_DIRS}
 MAKE_ENV+=             prefix=${PREFIX}
-MAKE_ENV+=             TCLTK_PATH=${WISH:Q}
+TK90WISH=              ${PREFIX}/${TK90_SUBDIR}/bin/wish
+MAKE_ENV+=             TCLTK_PATH=${TK90WISH:Q}
 
-USE_TOOLS+=            wish:run
-CONFIGURE_ARGS+=       --with-tcltk=${WISH:Q}
+CONFIGURE_ARGS+=       --with-tcltk=${TK90WISH:Q}
 
 INSTALLATION_DIRS+=    bin
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Darwin" && exists(/System/Library/Frameworks/Tk.framework)
-.  if exists(/System/Library/Frameworks/Tk.framework/Resources/Wish.app)
-WISH_APP=      Wish
-.  else
-WISH_APP=      Wish Shell
-.  endif
-PLIST_SUBST+=  WISH_APP=${WISH_APP:Q}
-.endif
-
 .if ${USE_CROSS_COMPILE:U:tl} == "yes"
 ALL_ENV+=              gitexecdir=${PREFIX:Q}/libexec/git-core # XXX
 CONFIGURE_ENV.NetBSD+= ac_cv_iconv_omits_bom=no
@@ -39,4 +30,6 @@ CONFIGURE_ENV.NetBSD+=        ac_cv_snprintf_re
 
 .include "../../devel/git/Makefile.common"
 
+# does not link against it, but we need TK90_SUBDIR
+.include "../../x11/tk90/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/git-gitk/PLIST
diff -u pkgsrc/devel/git-gitk/PLIST:1.12 pkgsrc/devel/git-gitk/PLIST:1.13
--- pkgsrc/devel/git-gitk/PLIST:1.12    Mon Aug 18 19:36:36 2025
+++ pkgsrc/devel/git-gitk/PLIST Wed Aug 20 08:47:19 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2025/08/18 19:36:36 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2025/08/20 08:47:19 wiz Exp $
 bin/gitk
 share/gitk/lib/msgs/bg.msg
 share/gitk/lib/msgs/ca.msg