 @@ -1,42 +1,41 @@
-# $NetBSD: Makefile,v 1.93 2023/06/14 10:29:45 riastradh Exp $
+# $NetBSD: Makefile,v 1.94 2023/06/26 15:53:25 adam Exp $
 DISTNAME=	tk${TK_VERSION}-src
 PKGNAME=	tk-${TK_VERSION}
 PKGREVISION=	1
 CATEGORIES=	x11 lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcl/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.tcl.tk/
 COMMENT=	Graphical toolkit for TCL
 LICENSE=	2-clause-bsd
 .include "../../x11/tk/Makefile.version"
 WRKSRC=			${WRKDIR}/tk${TK_VERSION}
 USE_GCC_RUNTIME=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_DIRS=		unix
 BUILD_DIRS=		${CONFIGURE_DIRS}
 CONFIGURE_ARGS+=	--with-tcl=${_CROSS_DESTDIR:U}${BUILDLINK_PREFIX.tcl}/lib
 CONFIGURE_ENV+=		LIB_RUNTIME_DIR=${PREFIX}/lib
 PKGCONFIG_OVERRIDE+=	unix/tk.pc.in
 TEST_TARGET=		test
 CHECK_PORTABILITY_SKIP=	win/configure
 .if defined(ABI) && ${ABI} == "64"
 CONFIGURE_ARGS+=	--enable-64bit
 .endif
 .include "options.mk"
 SUBST_CLASSES+=		tk-config
 SUBST_STAGE.tk-config=	post-build
 SUBST_FILES.tk-config=	unix/tkConfig.sh
 SUBST_SED.tk-config+=	-e "s|${WRKSRC}/unix|${PREFIX}/lib|"
 SUBST_SED.tk-config+=	-e "s|${WRKSRC}|${PREFIX}/include/tk|"
 PLIST_SUBST+=		SONUM=${TK_SONUM}

 @@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.19 2021/01/20 20:40:28 adam Exp $
+@comment $NetBSD: PLIST,v 1.20 2023/06/26 15:53:25 adam Exp $
 bin/wish
 bin/wish${BASEVER}
 ${PLIST.aqua}include/X11/DECkeysym.h
 ${PLIST.aqua}include/X11/HPkeysym.h
 ${PLIST.aqua}include/X11/Sunkeysym.h
 ${PLIST.aqua}include/X11/X.h
 ${PLIST.aqua}include/X11/XF86keysym.h
 ${PLIST.aqua}include/X11/Xatom.h
 ${PLIST.aqua}include/X11/Xfuncproto.h
 ${PLIST.aqua}include/X11/Xlib.h
 ${PLIST.aqua}include/X11/Xutil.h
 ${PLIST.aqua}include/X11/ap_keysym.h
 ${PLIST.aqua}include/X11/cursorfont.h
 @@ -37,26 +37,27 @@ include/tk/generic/tkIntPlatDecls.h
 include/tk/generic/tkIntXlibDecls.h
 include/tk/generic/tkMenu.h
 include/tk/generic/tkMenubutton.h
 include/tk/generic/tkPlatDecls.h
 include/tk/generic/tkPort.h
 include/tk/generic/tkScale.h
 include/tk/generic/tkScrollbar.h
 include/tk/generic/tkSelect.h
 include/tk/generic/tkText.h
 include/tk/generic/tkUndo.h
 include/tk/unix/tkUnixDefault.h
 include/tk/unix/tkUnixInt.h
 include/tk/unix/tkUnixPort.h
 include/tk/unix/tkUuid.h
 include/tkDecls.h
 include/tkInt.h
 include/tkIntDecls.h
 include/tkIntPlatDecls.h
 include/tkIntXlibDecls.h
 include/tkPlatDecls.h
 ${PLIST.aqua}lib/Tk.icns
 ${PLIST.aqua}lib/Tk.tiff
 lib/libtk${SONUM}.a
 lib/libtk${SONUM}.so
 lib/libtk${SONUM}.so.1.0
 lib/libtkstub${SONUM}.a
 lib/pkgconfig/tk.pc
 @@ -172,34 +173,36 @@ lib/tk${BASEVER}/images/tai-ku.gif
 lib/tk${BASEVER}/listbox.tcl
 lib/tk${BASEVER}/megawidget.tcl
 lib/tk${BASEVER}/menu.tcl
 lib/tk${BASEVER}/mkpsenc.tcl
 lib/tk${BASEVER}/msgbox.tcl
 lib/tk${BASEVER}/msgs/cs.msg
 lib/tk${BASEVER}/msgs/da.msg
 lib/tk${BASEVER}/msgs/de.msg
 lib/tk${BASEVER}/msgs/el.msg
 lib/tk${BASEVER}/msgs/en.msg
 lib/tk${BASEVER}/msgs/en_gb.msg
 lib/tk${BASEVER}/msgs/eo.msg
 lib/tk${BASEVER}/msgs/es.msg
 lib/tk${BASEVER}/msgs/fi.msg
 lib/tk${BASEVER}/msgs/fr.msg
 lib/tk${BASEVER}/msgs/hu.msg
 lib/tk${BASEVER}/msgs/it.msg
 lib/tk${BASEVER}/msgs/nl.msg
 lib/tk${BASEVER}/msgs/pl.msg
 lib/tk${BASEVER}/msgs/pt.msg
 lib/tk${BASEVER}/msgs/ru.msg
 lib/tk${BASEVER}/msgs/sv.msg
 lib/tk${BASEVER}/msgs/zh_cn.msg
 lib/tk${BASEVER}/obsolete.tcl
 lib/tk${BASEVER}/optMenu.tcl
 lib/tk${BASEVER}/palette.tcl
 lib/tk${BASEVER}/panedwindow.tcl
 lib/tk${BASEVER}/pkgIndex.tcl
 lib/tk${BASEVER}/safetk.tcl
 lib/tk${BASEVER}/scale.tcl
 lib/tk${BASEVER}/scrlbar.tcl
 lib/tk${BASEVER}/spinbox.tcl
 lib/tk${BASEVER}/tclIndex
 lib/tk${BASEVER}/tearoff.tcl
 lib/tk${BASEVER}/text.tcl
 lib/tk${BASEVER}/tk.tcl

 @@ -1,41 +1,41 @@
-# $NetBSD: buildlink3.mk,v 1.41 2023/01/29 21:15:19 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.42 2023/06/26 15:53:25 adam Exp $
 BUILDLINK_TREE+=	tk
 .if !defined(TK_BUILDLINK3_MK)
 TK_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.tk+=	tk>=8.5.7
 BUILDLINK_ABI_DEPENDS.tk+=	tk>=8.6.12nb1
 BUILDLINK_PKGSRCDIR.tk?=	../../x11/tk
 BUILDLINK_FILES.tk+=	bin/wish*
+#
 # Make "-ltk" and "-ltk8.6" resolve into "-ltk86", so that we don't
 # need to patch so many Makefiles.
+#
 BUILDLINK_TRANSFORM+=	l:tk:tk86
 BUILDLINK_TRANSFORM+=	l:tk8.6:tk86
 TKCONFIG_SH?=	${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
 _TOOLS_USE_PKGSRC.wish=	yes
-WISH=			${LOCALBASE}/bin/wish
+WISH=	${PREFIX}/bin/wish
 pkgbase := tk
 .include "../../mk/pkg-build-options.mk"
-.if !empty(PKG_BUILD_OPTIONS.tk:Mxft2)
+.if ${PKG_BUILD_OPTIONS.tk:Mxft2}
 .  include "../../x11/libXft/buildlink3.mk"
 .endif
 .if empty(PKG_BUILD_OPTIONS.tk:Maqua)
 .  include "../../x11/libX11/buildlink3.mk"
 .  include "../../x11/libXext/buildlink3.mk"
 .  include "../../x11/libXScrnSaver/buildlink3.mk"
 .endif
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .endif # TK_BUILDLINK3_MK
 BUILDLINK_TREE+=	-tk

 @@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.59 2021/11/16 16:25:09 adam Exp $
+$NetBSD: distinfo,v 1.60 2023/06/26 15:53:25 adam Exp $
-BLAKE2s (tk8.6.12-src.tar.gz) = 3bd977f5a13168b09bf001eed6adb0ceea64c1aa46277343dfc8eef480997625
+BLAKE2s (tk8.6.13-src.tar.gz) = d49336a4961ac9338042287c8e22fce96bfda59a28a2531d6d41b46185e14940
-SHA512 (tk8.6.12-src.tar.gz) = afe51eb3e2071640ebc57f9ee6979fe91ee7856df8d3c9d55ae70c470cdae2306d2feeb791f46258f529a5c4a07b53974a7574cf3594818cd4e99077b30c697b
+SHA512 (tk8.6.13-src.tar.gz) = 719aa6776bfdc814f817919a265d3f9d847782c9f0a5fc5c2ab139beeba921e6fde8c66e7e836d78f86f53c98a7df0e587f0b2f4b08cc5ce12eecbb7f1ab71a5
-Size (tk8.6.12-src.tar.gz) = 4515393 bytes
+Size (tk8.6.13-src.tar.gz) = 4546848 bytes
 SHA1 (patch-unix_Makefile.in) = f97307d551827c845c60e5ed775811a24c21f859
 SHA1 (patch-unix_configure) = af73fbbcba79d237a8c5915a217aeb19a1675fdd

 @@ -1,40 +1,40 @@
-# $NetBSD: options.mk,v 1.9 2020/12/14 08:46:56 dbj Exp $
+# $NetBSD: options.mk,v 1.10 2023/06/26 15:53:25 adam Exp $
 PKG_OPTIONS_VAR=	PKG_OPTIONS.tk
 PKG_SUPPORTED_OPTIONS=	threads debug xft2
 PKG_SUGGESTED_OPTIONS=	threads
 .include "../../mk/bsd.prefs.mk"
 PLIST_VARS+=	aqua
 .if ${OPSYS} != "Darwin"
 PKG_SUGGESTED_OPTIONS+=	xft2
 .else
 PKG_SUPPORTED_OPTIONS+=	aqua
 .endif
 .include "../../mk/bsd.options.mk"
 # IMPORTANT: This option should be enabled on a system without X11.
 # Otherwise some X11 headers are installed and will break X11 compatibility.
 .if !empty(PKG_OPTIONS:Maqua)
 CONFIGURE_ARGS+=	--enable-aqua
 CONFIGURE_ARGS+=	--without-x
 PLIST.aqua=		yes
 .else
 CONFIGURE_ARGS+=	--x-includes=${X11BASE}/include
-CONFIGURE_ARGS+=	--x-libraries=${X11BASE}/lib${LIBABISUFFIX:Q}
+CONFIGURE_ARGS+=	--x-libraries=${X11BASE}/lib${LIBABISUFFIX}
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXScrnSaver/buildlink3.mk"
 .endif
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=	--enable-symbols
 .endif
 .if !empty(PKG_OPTIONS:Mthreads)
 CONFIGURE_ARGS+=	--enable-threads
 PTHREAD_OPTS+=		require
 .include "../../mk/pthread.buildlink3.mk"

 @@ -1,10 +1,10 @@
-# $NetBSD: Makefile.version,v 1.24 2021/11/16 16:25:09 adam Exp $
+# $NetBSD: Makefile.version,v 1.25 2023/06/26 15:53:25 adam Exp $
 # used by cad/xcircuit/Makefile
 # used by devel/tcl-tclcl/Makefile
 # used by lang/tcl/Makefile
 # used by lang/tcl-otcl/Makefile
 # used by x11/tk/Makefile
 TK_SONUM=	86
 TK_BASEVER=	8.6
-TK_VERSION=	8.6.12
+TK_VERSION=	8.6.13