Index: Makefile =================================================================== RCS file: /cvsroot/pkgsrc/x11/tk/Makefile,v retrieving revision 1.96 diff -u -r1.96 Makefile --- Makefile 6 Apr 2024 05:37:48 -0000 1.96 +++ Makefile 15 Jul 2025 08:24:29 -0000 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.96 2024/04/06 05:37:48 adam Exp $ +# $NetBSD: Makefile,v 1.1 2025/03/08 11:46:37 scole Exp $ DISTNAME= tk${TK_VERSION}-src PKGNAME= tk-${TK_VERSION} @@ -20,16 +20,21 @@ CONFIGURE_DIRS= unix BUILD_DIRS= ${CONFIGURE_DIRS} CONFIGURE_ARGS+= --with-tcl=${_CROSS_DESTDIR:U}${BUILDLINK_PREFIX.tcl}/lib + +# xxx confusing arg to build tk zip file. man wish(1), zipfs(n) +CONFIGURE_ARGS+= --disable-zipfs +CONFIGURE_ARGS+= --enable-libcups=no + CONFIGURE_ENV+= LIB_RUNTIME_DIR=${PREFIX}/lib PKGCONFIG_OVERRIDE+= unix/tk.pc.in + +# xxx whether tests pass, fail, or even complete seems window manager +# dependent and/or if mouse pointer/focus changes. ctwm was able to +# finish and passed almost all of the tests for me 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 @@ -40,6 +45,20 @@ PLIST_SUBST+= SONUM=${TK_SONUM} PLIST_SUBST+= BASEVER=${TK_BASEVER} +PLIST_SUBST+= VERSION=${TK_VERSION} + +post-install: + cd ${WRKSRC}/unix && ${MAKE} \ + BIN_INSTALL_DIR=${DESTDIR}${PREFIX}/bin \ + LIB_INSTALL_DIR=${DESTDIR}${PREFIX}/lib \ + CONFIG_INSTALL_DIR=${DESTDIR}${PREFIX}/lib \ + SCRIPT_INSTALL_DIR=${DESTDIR}${PREFIX}/lib/tk${TK_BASEVER} \ + INCLUDE_INSTALL_DIR=${DESTDIR}${PREFIX}/include \ + PRIVATE_INCLUDE_DIR=${DESTDIR}${PREFIX}/include \ + MAN_INSTALL_DIR=${DESTDIR}${PREFIX}/${PKGMANDIR} \ + DEMO_INSTALL_DIR=${DESTDIR}${PREFIX}/lib/tk${TK_BASEVER}/demos \ + install install-binaries + cd ${DESTDIR}${PREFIX}/bin && ${LN} -fs wish${TK_BASEVER} wish .include "../../lang/tcl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: Makefile.version =================================================================== RCS file: /cvsroot/pkgsrc/x11/tk/Makefile.version,v retrieving revision 1.27 diff -u -r1.27 Makefile.version --- Makefile.version 25 Jan 2025 21:32:11 -0000 1.27 +++ Makefile.version 15 Jul 2025 08:24:29 -0000 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile.version,v 1.27 2025/01/25 21:32:11 adam Exp $ +# $NetBSD: Makefile.version,v 1.1 2025/03/08 11:46:24 scole 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.16 +TK_SONUM= 90 +TK_BASEVER= 9.0 +TK_VERSION= 9.0.1 Index: PLIST =================================================================== RCS file: /cvsroot/pkgsrc/x11/tk/PLIST,v retrieving revision 1.21 diff -u -r1.21 PLIST --- PLIST 25 Jan 2025 21:32:11 -0000 1.21 +++ PLIST 15 Jul 2025 08:24:29 -0000 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.21 2025/01/25 21:32:11 adam Exp $ +@comment $NetBSD: PLIST,v 1.1 2025/03/08 11:46:55 scole Exp $ bin/wish bin/wish${BASEVER} ${PLIST.aqua}include/X11/DECkeysym.h @@ -16,50 +16,12 @@ ${PLIST.aqua}include/X11/keysymdef.h ${PLIST.aqua}include/X11/xbytes.h include/tk.h -include/tk/generic/default.h -include/tk/generic/ks_names.h -include/tk/generic/tk.h -include/tk/generic/tk3d.h -include/tk/generic/tkArray.h -include/tk/generic/tkBusy.h -include/tk/generic/tkButton.h -include/tk/generic/tkCanvas.h -include/tk/generic/tkColor.h -include/tk/generic/tkDList.h -include/tk/generic/tkDecls.h -include/tk/generic/tkEntry.h -include/tk/generic/tkFileFilter.h -include/tk/generic/tkFont.h -include/tk/generic/tkImgPhoto.h -include/tk/generic/tkInt.h -include/tk/generic/tkIntDecls.h -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/libtcl9tk${BASEVER}.so +lib/libtkstub.a lib/pkgconfig/tk.pc lib/tk${BASEVER}/bgerror.tcl lib/tk${BASEVER}/button.tcl @@ -97,6 +59,8 @@ lib/tk${BASEVER}/demos/icon.tcl lib/tk${BASEVER}/demos/image1.tcl lib/tk${BASEVER}/demos/image2.tcl +lib/tk${BASEVER}/demos/images/Tcl.svg +lib/tk${BASEVER}/demos/images/Tk_feather.png lib/tk${BASEVER}/demos/images/earth.gif lib/tk${BASEVER}/demos/images/earthmenu.png lib/tk${BASEVER}/demos/images/earthris.gif @@ -107,6 +71,8 @@ lib/tk${BASEVER}/demos/images/noletter.xbm lib/tk${BASEVER}/demos/images/ouster.png lib/tk${BASEVER}/demos/images/pattern.xbm +lib/tk${BASEVER}/demos/images/plowed_field.png +lib/tk${BASEVER}/demos/images/starry_night.png lib/tk${BASEVER}/demos/images/tcllogo.gif lib/tk${BASEVER}/demos/images/teapot.ppm lib/tk${BASEVER}/demos/items.tcl @@ -115,6 +81,9 @@ lib/tk${BASEVER}/demos/label.tcl lib/tk${BASEVER}/demos/labelframe.tcl lib/tk${BASEVER}/demos/license.terms +lib/tk${BASEVER}/demos/mac_styles.tcl +lib/tk${BASEVER}/demos/mac_tabs.tcl +lib/tk${BASEVER}/demos/mac_wm.tcl lib/tk${BASEVER}/demos/mclist.tcl lib/tk${BASEVER}/demos/menu.tcl lib/tk${BASEVER}/demos/menubu.tcl @@ -124,6 +93,7 @@ lib/tk${BASEVER}/demos/paned2.tcl lib/tk${BASEVER}/demos/pendulum.tcl lib/tk${BASEVER}/demos/plot.tcl +lib/tk${BASEVER}/demos/print.tcl lib/tk${BASEVER}/demos/puzzle.tcl lib/tk${BASEVER}/demos/radio.tcl lib/tk${BASEVER}/demos/rmt @@ -134,6 +104,7 @@ lib/tk${BASEVER}/demos/spin.tcl lib/tk${BASEVER}/demos/states.tcl lib/tk${BASEVER}/demos/style.tcl +lib/tk${BASEVER}/demos/systray.tcl lib/tk${BASEVER}/demos/tclIndex lib/tk${BASEVER}/demos/tcolor lib/tk${BASEVER}/demos/text.tcl @@ -152,10 +123,12 @@ lib/tk${BASEVER}/demos/unicodeout.tcl lib/tk${BASEVER}/demos/vscale.tcl lib/tk${BASEVER}/demos/widget +lib/tk${BASEVER}/demos/windowicons.tcl lib/tk${BASEVER}/dialog.tcl lib/tk${BASEVER}/entry.tcl lib/tk${BASEVER}/focus.tcl lib/tk${BASEVER}/fontchooser.tcl +lib/tk${BASEVER}/iconbadges.tcl lib/tk${BASEVER}/iconlist.tcl lib/tk${BASEVER}/icons.tcl lib/tk${BASEVER}/images/README @@ -194,15 +167,17 @@ 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}/print.tcl lib/tk${BASEVER}/safetk.tcl lib/tk${BASEVER}/scale.tcl +lib/tk${BASEVER}/scaling.tcl lib/tk${BASEVER}/scrlbar.tcl lib/tk${BASEVER}/spinbox.tcl +lib/tk${BASEVER}/systray.tcl lib/tk${BASEVER}/tclIndex lib/tk${BASEVER}/tearoff.tcl lib/tk${BASEVER}/text.tcl @@ -233,7 +208,6 @@ lib/tk${BASEVER}/ttk/vistaTheme.tcl lib/tk${BASEVER}/ttk/winTheme.tcl lib/tk${BASEVER}/ttk/xpTheme.tcl -lib/tk${BASEVER}/unsupported.tcl lib/tk${BASEVER}/xmfbox.tcl lib/tkConfig.sh man/man1/wish.1 @@ -250,6 +224,7 @@ man/man3/Tk_AllocColorFromObj.3 man/man3/Tk_AllocCursorFromObj.3 man/man3/Tk_AllocFontFromObj.3 +man/man3/Tk_AlwaysShowSelection.3 man/man3/Tk_AttachHWND.3 man/man3/Tk_Attributes.3 man/man3/Tk_BindEvent.3 @@ -272,6 +247,7 @@ man/man3/Tk_CharBbox.3 man/man3/Tk_Class.3 man/man3/Tk_ClearSelection.3 +man/man3/Tk_ClipDrawableToRect.3 man/man3/Tk_ClipboardAppend.3 man/man3/Tk_ClipboardClear.3 man/man3/Tk_CollapseMotionEvents.3 @@ -315,11 +291,14 @@ man/man3/Tk_Draw3DPolygon.3 man/man3/Tk_Draw3DRectangle.3 man/man3/Tk_DrawChars.3 +man/man3/Tk_DrawCharsInContext.3 man/man3/Tk_DrawFocusHighlight.3 +man/man3/Tk_DrawHighlightBorder.3 man/man3/Tk_DrawTextLayout.3 man/man3/Tk_Fill3DPolygon.3 man/man3/Tk_Fill3DRectangle.3 man/man3/Tk_FindPhoto.3 +man/man3/Tk_FontGetDescription.3 man/man3/Tk_FontId.3 man/man3/Tk_Free3DBorder.3 man/man3/Tk_Free3DBorderFromObj.3 @@ -339,9 +318,9 @@ man/man3/Tk_FreePixmap.3 man/man3/Tk_FreeSavedOptions.3 man/man3/Tk_FreeTextLayout.3 -man/man3/Tk_FreeXId.3 man/man3/Tk_GeometryRequest.3 man/man3/Tk_Get3DBorder.3 +man/man3/Tk_Get3DBorderColors.3 man/man3/Tk_Get3DBorderFromObj.3 man/man3/Tk_GetAllBindings.3 man/man3/Tk_GetAnchor.3 @@ -350,6 +329,7 @@ man/man3/Tk_GetBinding.3 man/man3/Tk_GetBitmap.3 man/man3/Tk_GetBitmapFromObj.3 +man/man3/Tk_GetButtonMask.3 man/man3/Tk_GetCapStyle.3 man/man3/Tk_GetColor.3 man/man3/Tk_GetColorByValue.3 @@ -359,6 +339,7 @@ man/man3/Tk_GetCursorFromData.3 man/man3/Tk_GetCursorFromObj.3 man/man3/Tk_GetDash.3 +man/man3/Tk_GetDoublePixelsFromObj.3 man/man3/Tk_GetFont.3 man/man3/Tk_GetFontFromObj.3 man/man3/Tk_GetFontMetrics.3 @@ -366,7 +347,6 @@ man/man3/Tk_GetHINSTANCE.3 man/man3/Tk_GetHWND.3 man/man3/Tk_GetImage.3 -man/man3/Tk_GetImageMasterData.3 man/man3/Tk_GetImageModelData.3 man/man3/Tk_GetItemTypes.3 man/man3/Tk_GetJoinStyle.3 @@ -377,6 +357,7 @@ man/man3/Tk_GetOption.3 man/man3/Tk_GetOptionInfo.3 man/man3/Tk_GetOptionValue.3 +man/man3/Tk_GetOtherWindow.3 man/man3/Tk_GetPixels.3 man/man3/Tk_GetPixelsFromObj.3 man/man3/Tk_GetPixmap.3 @@ -399,7 +380,6 @@ man/man3/Tk_ImageChanged.3 man/man3/Tk_Init.3 man/man3/Tk_InitConsoleChannels.3 -man/man3/Tk_InitImageArgs.3 man/man3/Tk_InitOptions.3 man/man3/Tk_InitStubs.3 man/man3/Tk_InternAtom.3 @@ -417,10 +397,13 @@ man/man3/Tk_MainLoop.3 man/man3/Tk_MainWindow.3 man/man3/Tk_MaintainGeometry.3 +man/man3/Tk_MakeContainer.3 +man/man3/Tk_MakeWindow.3 man/man3/Tk_MakeWindowExist.3 man/man3/Tk_ManageGeometry.3 man/man3/Tk_MapWindow.3 man/man3/Tk_MeasureChars.3 +man/man3/Tk_MeasureCharsInContext.3 man/man3/Tk_MinReqHeight.3 man/man3/Tk_MinReqWidth.3 man/man3/Tk_MoveResizeWindow.3 @@ -439,7 +422,7 @@ man/man3/Tk_NameOfJustify.3 man/man3/Tk_NameOfRelief.3 man/man3/Tk_NameToWindow.3 -man/man3/Tk_Offset.3 +man/man3/Tk_NewWindowObj.3 man/man3/Tk_OwnSelection.3 man/man3/Tk_Parent.3 man/man3/Tk_ParseArgv.3 @@ -466,6 +449,7 @@ man/man3/Tk_SafeInit.3 man/man3/Tk_Screen.3 man/man3/Tk_ScreenNumber.3 +man/man3/Tk_SendVirtualEvent.3 man/man3/Tk_SetAppName.3 man/man3/Tk_SetBackgroundFromBorder.3 man/man3/Tk_SetCaretPos.3 @@ -490,12 +474,12 @@ man/man3/Tk_TextWidth.3 man/man3/Tk_Uid.3 man/man3/Tk_UndefineCursor.3 -man/man3/Tk_UnderlineChars.3 man/man3/Tk_UnderlineTextLayout.3 man/man3/Tk_Ungrab.3 man/man3/Tk_UnmaintainGeometry.3 man/man3/Tk_UnmapWindow.3 man/man3/Tk_UnsetGrid.3 +man/man3/Tk_UseWindow.3 man/man3/Tk_Visual.3 man/man3/Tk_Width.3 man/man3/Tk_WindowId.3 @@ -550,13 +534,14 @@ man/mann/menu.n man/mann/menubutton.n man/mann/message.n +man/mann/nsimage.n man/mann/option.n man/mann/options.n man/mann/pack.n -man/mann/pack_old.n man/mann/panedwindow.n man/mann/photo.n man/mann/place.n +man/mann/print.n man/mann/radiobutton.n man/mann/raise.n man/mann/safe_loadTk.n @@ -565,9 +550,10 @@ man/mann/selection.n man/mann/send.n man/mann/spinbox.n +man/mann/sysnotify.n +man/mann/systray.n man/mann/text.n man/mann/tk.n -man/mann/tk_bindForTraversal.n man/mann/tk_bisque.n man/mann/tk_chooseColor.n man/mann/tk_chooseDirectory.n @@ -579,14 +565,15 @@ man/mann/tk_getSaveFile.n man/mann/tk_library.n man/mann/tk_mac.n -man/mann/tk_menuBar.n man/mann/tk_menuSetFocus.n man/mann/tk_messageBox.n man/mann/tk_optionMenu.n man/mann/tk_patchLevel.n man/mann/tk_popup.n +man/mann/tk_scalingPct.n man/mann/tk_setPalette.n man/mann/tk_strictMotif.n +man/mann/tk_svgFmt.n man/mann/tk_textCopy.n man/mann/tk_textCut.n man/mann/tk_textPaste.n Index: buildlink3.mk =================================================================== RCS file: /cvsroot/pkgsrc/x11/tk/buildlink3.mk,v retrieving revision 1.43 diff -u -r1.43 buildlink3.mk --- buildlink3.mk 12 Nov 2023 13:24:31 -0000 1.43 +++ buildlink3.mk 15 Jul 2025 08:24:29 -0000 @@ -1,21 +1,20 @@ -# $NetBSD: buildlink3.mk,v 1.43 2023/11/12 13:24:31 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.1 2025/03/08 11:47:41 scole 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.13nb1 +BUILDLINK_API_DEPENDS.tk+= tk>=9.0.1 +BUILDLINK_ABI_DEPENDS.tk+= tk>=9.0.1 BUILDLINK_PKGSRCDIR.tk?= ../../x11/tk BUILDLINK_FILES.tk+= bin/wish* # -# Make "-ltk" and "-ltk8.6" resolve into "-ltk86", so that we don't +# Make "-ltk" resolve into "-ltk9.0", so that we don't # need to patch so many Makefiles. # -BUILDLINK_TRANSFORM+= l:tk:tk86 -BUILDLINK_TRANSFORM+= l:tk8.6:tk86 +BUILDLINK_TRANSFORM+= l:tk:tk9.0 TKCONFIG_SH?= ${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh Index: distinfo =================================================================== RCS file: /cvsroot/pkgsrc/x11/tk/distinfo,v retrieving revision 1.63 diff -u -r1.63 distinfo --- distinfo 30 Mar 2025 21:10:48 -0000 1.63 +++ distinfo 15 Jul 2025 08:24:29 -0000 @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.63 2025/03/30 21:10:48 wiz Exp $ +$NetBSD: distinfo,v 1.1 2025/03/08 11:49:23 scole Exp $ -BLAKE2s (tk8.6.16-src.tar.gz) = f789b22b709e1c7c5a632d9fbeb756c07662db899f245a9543e3c43359e05636 -SHA512 (tk8.6.16-src.tar.gz) = b7d37bee25f826f156137a04859ac756c682f1dd155ec9629119dc3690509ce1b6e308e23b291f2debbc10f3b1650993fea66463e5445c505860a10acac901d0 -Size (tk8.6.16-src.tar.gz) = 4591625 bytes -SHA1 (patch-unix_Makefile.in) = 782d1396ea6729da9824e08a4ce26f882a8515b4 -SHA1 (patch-unix_configure) = d79c6d3b828c8126c8486003826eab0445921dd9 +BLAKE2s (tk9.0.1-src.tar.gz) = 936c9165b13ff59e632122b9054ee2699b7f5c582e5123b7241b033dbf8f6d1c +SHA512 (tk9.0.1-src.tar.gz) = c84afb1eace7e08f6b8a0754ba1a3f12506a05215436324d2fc31901c67331073c10744ee007dea249547fcc3f3e5e850be825b79c70e652c889677d03a43e81 +Size (tk9.0.1-src.tar.gz) = 4577595 bytes Index: options.mk =================================================================== RCS file: /cvsroot/pkgsrc/x11/tk/options.mk,v retrieving revision 1.10 diff -u -r1.10 options.mk --- options.mk 26 Jun 2023 15:53:25 -0000 1.10 +++ options.mk 15 Jul 2025 08:24:29 -0000 @@ -1,21 +1,31 @@ -# $NetBSD: options.mk,v 1.10 2023/06/26 15:53:25 adam Exp $ +# $NetBSD: options.mk,v 1.1 2025/03/08 11:50:07 scole Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.tk -PKG_SUPPORTED_OPTIONS= threads debug xft2 -PKG_SUGGESTED_OPTIONS= threads +PKG_OPTIONS_VAR= PKG_OPTIONS.tk +PKG_SUPPORTED_OPTIONS= aqua debug xft2 +#PKG_SUGGESTED_OPTIONS+= .include "../../mk/bsd.prefs.mk" +.include "../../mk/bsd.options.mk" -PLIST_VARS+= aqua +# xxx NetBSD 64bit detected but not supported in configure script: +# configure: WARNING: 64bit support being disabled -- don't know magic for this platform +.if ${MACHINE_ARCH} == "sparc64" +CONFIGURE_ARGS+= --enable-64bit-vis +.else +. for plat in ${LP64PLATFORMS} +. if ${MACHINE_PLATFORM:M${plat}} +CONFIGURE_ARGS+= --enable-64bit +. endif +. endfor +.endif +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) @@ -23,6 +33,7 @@ CONFIGURE_ARGS+= --without-x PLIST.aqua= yes .else +CONFIGURE_ARGS+= --with-x CONFIGURE_ARGS+= --x-includes=${X11BASE}/include CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib${LIBABISUFFIX} .include "../../x11/libX11/buildlink3.mk" @@ -34,14 +45,6 @@ CONFIGURE_ARGS+= --enable-symbols .endif -.if !empty(PKG_OPTIONS:Mthreads) -CONFIGURE_ARGS+= --enable-threads -PTHREAD_OPTS+= require -.include "../../mk/pthread.buildlink3.mk" -.else -CONFIGURE_ARGS+= --disable-threads -.endif - .if !empty(PKG_OPTIONS:Mxft2) CONFIGURE_ARGS+= --enable-xft USE_TOOLS+= pkg-config Index: patches/patch-unix_Makefile.in =================================================================== RCS file: patches/patch-unix_Makefile.in diff -N patches/patch-unix_Makefile.in --- patches/patch-unix_Makefile.in 30 Mar 2025 21:10:48 -0000 1.12 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,145 +0,0 @@ -$NetBSD: patch-unix_Makefile.in,v 1.12 2025/03/30 21:10:48 wiz Exp $ - -Honor LDFLAGS. -Standardize file names. - ---- unix/Makefile.in.orig 2024-02-28 15:18:35.000000000 +0000 -+++ unix/Makefile.in -@@ -14,6 +14,7 @@ MAJOR_VERSION = @TK_MAJOR_VERSION@ - MINOR_VERSION = @TK_MINOR_VERSION@ - PATCH_LEVEL = @TK_PATCH_LEVEL@ - LOCALES = @LOCALES@ -+SHLIB_VERSION = @SHLIB_VERSION@ - - #---------------------------------------------------------------- - # Things you can change to personalize the Makefile for your own -@@ -65,6 +66,8 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TK - - # Directory in which to install the include file tk.h: - INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) -+UNIX_INCLUDE_INSTALL_DIR = $(DESTDIR)$(prefix)/include/tk/unix -+GENERIC_INCLUDE_INSTALL_DIR = $(DESTDIR)$(prefix)/include/tk/generic - - # Path to the private tk header dir: - PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ -@@ -102,7 +105,7 @@ DEMO_INSTALL_DIR = $(INSTALL_ROOT)$(TK_L - # for this version of Tk ("srcdir" will be replaced or has already - # been replaced by the configure script): - TCLDIR = @TCL_SRC_DIR@ --TCL_GENERIC_DIR = $(TCLDIR)/generic -+TCL_GENERIC_DIR = $(TCL_BIN_DIR)/../include/tcl/generic - - # The directory containing the platform specific Tcl sources and headers - # appropriate for this version of Tk: -@@ -121,7 +124,7 @@ TK_SHARED_BUILD = @TK_SHARED_BUILD@ - # Subdirectory of $(libdir) containing the pkgIndex.tcl file for loadable Tk - TK_PKG_DIR = @TK_PKG_DIR@ - --# Directory in which to install the pkgIndex.tcl file for loadable Tk -+ # Directory in which to install the pkgIndex.tcl file for loadable Tk - PKG_INSTALL_DIR = $(LIB_INSTALL_DIR)/$(TK_PKG_DIR) - - # Package index file for loadable Tk -@@ -139,7 +142,7 @@ CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ - #CFLAGS = $(CFLAGS_DEBUG) - #CFLAGS = $(CFLAGS_OPTIMIZE) - #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) --CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@ -+CFLAGS += @CFLAGS_DEFAULT@ @CFLAGS@ - - # Flags to pass to the linker - LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ -@@ -247,6 +250,7 @@ TK_STUB_LIB_FLAG = @TK_STUB_LIB_FLAG@ - #TK_STUB_LIB_FLAG = -ltkstub - - TK_LIB_FILE = @TK_LIB_FILE@ -+TK_LIB_A_FILE = ${TK_LIB_FILE:@SHLIB_SUFFIX@=.a} - #TK_LIB_FILE = libtk.a - - # Generic lib name used in rules that apply to tcl and tk -@@ -278,6 +282,8 @@ SHLIB_LD = @SHLIB_LD@ - SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ - TK_SHLIB_LD_EXTRAS = @TK_SHLIB_LD_EXTRAS@ - -+SHLIB_SUFFIX = @SHLIB_SUFFIX@ -+ - # Additional search flags needed to find the various shared libraries - # at run-time. The first symbol is for use when creating a binary - # with cc, and the second is for use when running ld directly. -@@ -568,6 +574,9 @@ PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $( - - DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget - -+INSTALL_HDRS = tk.h tkInt.h tkDecls.h tkIntDecls.h tkPlatDecls.h \ -+ tkIntPlatDecls.h tkIntXlibDecls.h -+ - SHELL_ENV = \ - @LD_LIBRARY_PATH_VAR@="`pwd`:${TCL_BIN_DIR}:$${@LD_LIBRARY_PATH_VAR@}"; \ - export @LD_LIBRARY_PATH_VAR@; \ -@@ -591,6 +600,11 @@ ${LIB_FILE}: ${STUB_LIB_FILE} @LIB_RSRC_ - rm -f $@ - @MAKE_LIB@ - -+${TK_LIB_A_FILE}: ${OBJS} -+ rm -f $@ -+ ar cr $@ ${OBJS} -+ $(RANLIB) $@ -+ - ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} - @if test "x${LIB_FILE}" = "xlibtk${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \ - (cd ${TOP_DIR}/win; ${MAKE} tk${MAJOR_VERSION}${MINOR_VERSION}.dll); \ -@@ -715,7 +729,7 @@ install-strip: - INSTALL_PROGRAM="STRIPPROG='${INSTALL_STRIP_PROGRAM}' $(INSTALL_PROGRAM) -s" \ - INSTALL_LIBRARY="STRIPPROG='${INSTALL_STRIP_LIBRARY}' $(INSTALL_LIBRARY) -s" - --install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE} -+install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) $(TK_LIB_A_FILE) ${WISH_EXE} ${TK_LIB_A_FILE} - @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \ - "$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \ - do \ -@@ -745,13 +759,20 @@ install-binaries: $(TK_STUB_LIB_FILE) $( - fi - @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" - @@INSTALL_LIB@ -- @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" -+ @cd "$(DLL_INSTALL_DIR)" && if test "$(SHLIB_SUFFIX)" = ".dylib"; then \ -+ ln -sf libtk$(MAJOR_VERSION)$(MINOR_VERSION)$(SHLIB_VERSION)$(SHLIB_SUFFIX) $(LIB_FILE) ; \ -+ else \ -+ ln -sf libtk$(MAJOR_VERSION)$(MINOR_VERSION)$(SHLIB_SUFFIX)$(SHLIB_VERSION) $(LIB_FILE) ; \ -+ fi -+ @echo "Installing ${TK_LIB_A_FILE} to $(DLL_INSTALL_DIR)/" -+ @$(INSTALL_DATA) ${TK_LIB_A_FILE} $(DLL_INSTALL_DIR)/${TK_LIB_A_FILE} - @if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \ - $(INSTALL_LIBRARY) "tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\ - chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\ - fi - @echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}" - @$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}" -+ @cd "$(BIN_INSTALL_DIR)" && ln -sf wish$(VERSION)@EXEEXT@ wish - @echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/" - @$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)/tkConfig.sh" - @if test "$(STUB_LIB_FILE)" != "" ; then \ -@@ -859,7 +880,7 @@ install-doc: - install-headers: - @if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \ - XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \ -- for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}"; \ -+ for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}" "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; \ - do \ - if [ -n "$$i" -a ! -d "$$i" ] ; then \ - echo "Making directory $$i"; \ -@@ -868,9 +889,12 @@ install-headers: - fi; \ - done; - @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/"; -- @for i in $(PUBLIC_HDRS); \ -+ $(INSTALL_DATA) $(GENERIC_DIR)/*.h "$(GENERIC_INCLUDE_INSTALL_DIR)"/ -+ $(INSTALL_DATA) $(UNIX_DIR)/*.h "$(UNIX_INCLUDE_INSTALL_DIR)"/ -+ @for i in $(INSTALL_HDRS); \ - do \ -- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \ -+ j=`basename $$i` ; \ -+ cd "$(INCLUDE_INSTALL_DIR)" && ln -sf tk/generic/$$j $$j ; \ - done; - @list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \ - do \ Index: patches/patch-unix_configure =================================================================== RCS file: patches/patch-unix_configure diff -N patches/patch-unix_configure --- patches/patch-unix_configure 30 Mar 2025 21:10:48 -0000 1.19 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,146 +0,0 @@ -$NetBSD: patch-unix_configure,v 1.19 2025/03/30 21:10:48 wiz Exp $ - -Honor LDFLAGS. -Standardize file names. - ---- unix/configure.orig 2024-12-10 17:31:03.000000000 +0000 -+++ unix/configure -@@ -4378,10 +4378,10 @@ fi - # LDFLAGS_ARCH so they eventually end up in LDFLAGS even if [load] - # is disabled by the user. [Bug 1016796] - LDFLAGS_ARCH="" -- UNSHARED_LIB_SUFFIX="" -+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' - TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`' - ECHO_VERSION='`echo ${VERSION}`' -- TCL_LIB_VERSIONS_OK=ok -+ TCL_LIB_VERSIONS_OK=nodots - CFLAGS_DEBUG=-g - if test "$GCC" = yes; then - -@@ -5376,7 +5376,7 @@ fi - - LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}' -- LDFLAGS="-Wl,-export-dynamic" -+ LDFLAGS="-Wl,--export-dynamic" - CFLAGS_OPTIMIZE="-O2" - if test "${TCL_THREADS}" = "1"; then - -@@ -5394,11 +5394,10 @@ fi - NetBSD-*) - # NetBSD has ELF and can use 'cc -shared' to build shared libs - SHLIB_CFLAGS="-fPIC" -- SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared' -+ SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared ${LDFLAGS}' - SHLIB_SUFFIX=".so" - DL_OBJS="tclLoadDl.o" - DL_LIBS="" -- LDFLAGS="$LDFLAGS -export-dynamic" - if test $doRpath = yes; then - - CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"' -@@ -6673,12 +6672,12 @@ fi - - if test "$SHARED_LIB_SUFFIX" = ""; then - -- SHARED_LIB_SUFFIX='${VERSION}${SHLIB_SUFFIX}' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}${SHLIB_SUFFIX}' - fi - - if test "$UNSHARED_LIB_SUFFIX" = ""; then - -- UNSHARED_LIB_SUFFIX='${VERSION}.a' -+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' - fi - - DLL_INSTALL_DIR="\$(LIB_INSTALL_DIR)" -@@ -6694,7 +6693,11 @@ fi - - else - -- INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"' -+ if test "${SHLIB_SUFFIX}" = ".dylib" ; then -+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/libtk$(MAJOR_VERSION)$(MINOR_VERSION)$(SHLIB_VERSION)$(SHLIB_SUFFIX)"' -+ else -+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)$(SHLIB_VERSION)"' -+ fi - - fi - -@@ -6729,7 +6732,7 @@ else - - fi - -- INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)"' -+ INSTALL_STUB_LIB='$(INSTALL_DATA) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)"' - - # Define TCL_LIBS now that we know what DL_LIBS is. - # The trick here is that we don't want to change the value of TCL_LIBS if -@@ -9820,7 +9823,7 @@ echo $ECHO_N "checking for X11 libraries - if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl -o -r $i/libX11.dylib; then - echo "$as_me:$LINENO: result: $i" >&5 - echo "${ECHO_T}$i" >&6 -- XLIBSW="-L$i -lX11" -+ XLIBSW="-L$i ${COMPILER_RPATH_FLAG}$i -lX11" - x_libraries="$i" - break - fi -@@ -9829,7 +9832,7 @@ echo "${ECHO_T}$i" >&6 - if test "$x_libraries" = ""; then - XLIBSW=-lX11 - else -- XLIBSW="-L$x_libraries -lX11" -+ XLIBSW="-L$x_libraries ${COMPILER_RPATH_FLAG}$x_libraries -lX11" - fi - fi - if test "$XLIBSW" = nope ; then -@@ -9925,11 +9928,6 @@ fi - # be replaced by spaces. - #-------------------------------------------------------------------- - --if test "x${x_libraries}" != "x"; then -- if test "x${x_libraries}" != "xNONE"; then -- LIB_RUNTIME_DIR="${LIB_RUNTIME_DIR}:${x_libraries}" -- fi --fi - if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then - LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'` - fi -@@ -11171,14 +11169,10 @@ else - TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`" - TK_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win ${TK_LIB_FLAG}" - else -- if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then -- TK_LIB_FLAG="-ltk${TK_VERSION}" -- else - TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`" -- fi - TK_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG}" - fi -- TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}" -+ TK_LIB_SPEC="-L${libdir} ${COMPILER_RPATH_FLAG}${libdir} ${TK_LIB_FLAG}" - fi - - #-------------------------------------------------------------------- -@@ -11190,11 +11184,7 @@ fi - eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}" - eval "TK_STUB_LIB_DIR=\"${libdir}\"" - --if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then -- TK_STUB_LIB_FLAG="-ltkstub${TK_VERSION}" --else -- TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`" --fi -+TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`" - - TK_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_STUB_LIB_FLAG}" - TK_STUB_LIB_SPEC="-L${TK_STUB_LIB_DIR} ${TK_STUB_LIB_FLAG}" -@@ -12018,6 +12008,7 @@ s,@APP_RSRC_FILE@,$APP_RSRC_FILE,;t t - s,@REZ@,$REZ,;t t - s,@REZ_FLAGS@,$REZ_FLAGS,;t t - s,@LTLIBOBJS@,$LTLIBOBJS,;t t -+s,@SHLIB_VERSION@,$SHLIB_VERSION,;t t - CEOF - - _ACEOF