| components/tcl/tk/Makefile | ●●●●● patch | view | raw | blame | history | |
| components/tcl/tk/manifests/sample-manifest.p5m | ●●●●● patch | view | raw | blame | history | |
| components/tcl/tk/test/results-32-i386.master | ●●●●● patch | view | raw | blame | history | |
| components/tcl/tk/test/results-64-i386.master | ●●●●● patch | view | raw | blame | history | |
| components/tcl/tk/test/results-all.master | ●●●●● patch | view | raw | blame | history | |
| components/tcl/tk/tk.p5m | ●●●●● patch | view | raw | blame | history |
components/tcl/tk/Makefile
@@ -22,14 +22,16 @@ # # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2020, Michal Nowak # Copyright (c) 2023, Klaus Ziegler # BUILD_BITS= 32_and_64 include ../../../make-rules/shared-macros.mk USE_COMMON_TEST_MASTER= yes COMPONENT_NAME= tk COMPONENT_MAJOR_VERSION= 8.6 COMPONENT_VERSION= $(COMPONENT_MAJOR_VERSION).13 COMPONENT_REVISION= 1 COMPONENT_SUMMARY= Tk - TCL GUI Toolkit COMPONENT_DESCRIPTION= Tk is an open source, cross-platform widget toolkit that provides a library of basic elements for building a graphical user interface COMPONENT_PROJECT_URL= https://www.tcl-lang.org/ @@ -56,29 +58,26 @@ # file at the pointed location CONFIGURE_SCRIPT= $(SOURCE_DIR)/unix/configure CONFIGURE_BINDIR.32= $(CONFIGURE_PREFIX)/bin/$(MACH32) CFLAGS += $(XPG6MODE) -std=c99 CONFIGURE_OPTIONS += --enable-shared CONFIGURE_OPTIONS += --enable-man-symlinks CONFIGURE_OPTIONS += --enable-threads CONFIGURE_OPTIONS += --with-tcl="$(COMPONENT_DIR)/../tcl/build/$(MACH$(BITS))" # Prevents a '64-bit runpath in 32-bit binary' pkglint warning CONFIGURE_OPTIONS.32 += -x-libraries=/usr/lib CONFIGURE_OPTIONS.64 += --enable-64bit CONFIGURE_OPTIONS += --enable-64bit ifeq ($(strip $(MACH)),sparc) CONFIGURE_OPTIONS += --enable-64bit-vis endif # Don't use rpath COMPONENT_POST_INSTALL_ACTION += \ find $(PROTO_DIR) -name libtk$(COMPONENT_MAJOR_VERSION).so -exec chmod 0755 {} \; ; COMPONENT_POST_INSTALL_ACTION += \ sed -f $(COMPONENT_DIR)/files/tksed.$(BITS) \ $(PROTO_DIR)$(USRLIBDIR.$(BITS))/tkConfig.sh > \ $(PROTO_DIR)$(USRLIBDIR.$(BITS))/tkConfig.sh.new; \ $(MV) $(PROTO_DIR)$(USRLIBDIR.$(BITS))/tkConfig.sh.new \ $(PROTO_DIR)$(USRLIBDIR.$(BITS))/tkConfig.sh; \ $(CHMOD) 555 $(PROTO_DIR)$(USRLIBDIR.$(BITS))/tkConfig.sh sed -f $(COMPONENT_DIR)/files/tksed $(PROTOUSRLIBDIR64)/tkConfig.sh > \ $(PROTOUSRLIBDIR64)/tkConfig.sh.new \ $(MV) $(PROTOUSRLIBDIR64)/tkConfig.sh.new $(PROTOUSRLIBDIR64)/tkConfig.sh; \ $(CHMOD) 555 $(PROTOUSRLIBDIR64)/tkConfig.sh # Tests are run using an X virtual framebuffer. # When we have the equivalent of REQUIRED_PACKAGES for test dependencies, @@ -92,8 +91,8 @@ $(SHELL) $(COMPONENT_DIR)/stop_Xvfb $(COMPONENT_DIR) # Test results differ between 32-bit and 64-bit and x86 and SPARC. COMPONENT_TEST_MASTER = \ $(COMPONENT_TEST_RESULTS_DIR)/results-$(BITS)-$(MACH).master #COMPONENT_TEST_MASTER = \ # $(COMPONENT_TEST_RESULTS_DIR)/results-$(BITS)-$(MACH).master COMPONENT_TEST_TRANSFORMS= \ '-n' \ @@ -105,7 +104,6 @@ ../tcl/build/%/.built: (cd ../tcl ; $(GMAKE) build) $(CONFIGURE_32): ../tcl/build/$(MACH32)/.built $(CONFIGURE_64): ../tcl/build/$(MACH64)/.built # Required for test suite components/tcl/tk/manifests/sample-manifest.p5m
@@ -10,7 +10,7 @@ # # # Copyright 2022 <contributor> # Copyright 2023 <contributor> # set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) @@ -23,8 +23,7 @@ license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' file path=usr/bin/$(MACH32)/wish8.6 file path=usr/bin/$(MACH64)/wish8.6 file path=usr/bin/wish8.6 file path=usr/include/tk.h file path=usr/include/tkDecls.h file path=usr/include/tkPlatDecls.h @@ -33,9 +32,7 @@ file path=usr/lib/$(MACH64)/pkgconfig/tk.pc file path=usr/lib/$(MACH64)/tk8.6/pkgIndex.tcl file path=usr/lib/$(MACH64)/tkConfig.sh file path=usr/lib/libtk8.6.so file path=usr/lib/libtkstub8.6.a file path=usr/lib/pkgconfig/tk.pc file path=usr/lib/$(MACH64)/tkConfig.sh.new file path=usr/lib/tk8.6/bgerror.tcl file path=usr/lib/tk8.6/button.tcl file path=usr/lib/tk8.6/choosedir.tcl @@ -172,7 +169,6 @@ file path=usr/lib/tk8.6/optMenu.tcl file path=usr/lib/tk8.6/palette.tcl file path=usr/lib/tk8.6/panedwindow.tcl file path=usr/lib/tk8.6/pkgIndex.tcl file path=usr/lib/tk8.6/safetk.tcl file path=usr/lib/tk8.6/scale.tcl file path=usr/lib/tk8.6/scrlbar.tcl @@ -209,7 +205,6 @@ file path=usr/lib/tk8.6/ttk/xpTheme.tcl file path=usr/lib/tk8.6/unsupported.tcl file path=usr/lib/tk8.6/xmfbox.tcl file path=usr/lib/tkConfig.sh file path=usr/share/man/man1/wish.1 file path=usr/share/man/man1t/bell.1t file path=usr/share/man/man1t/bind.1t components/tcl/tk/test/results-32-i386.master
File was deleted components/tcl/tk/test/results-64-i386.master
File was deleted components/tcl/tk/test/results-all.master
New file @@ -0,0 +1,6 @@ all.tcl: Total 9681 Passed 8834 Skipped 789 Failed 58 Sourced 92 Test Files. Files with failing tests: canvText.test clrpick.test focus.test font.test pack.test place.test scrollbar.test unixEmbed.test unixFont.test unixWm.test winWm.test winfo.test wm.test all.tcl: Total 496 Passed 474 Skipped 17 Failed 5 Sourced 17 Test Files. Files with failing tests: entry.test components/tcl/tk/tk.p5m
@@ -20,6 +20,7 @@ # # Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2020, Michal Nowak # Copyright (c) 2023, Klaus Ziegler # set name=pkg.fmri \ @@ -33,19 +34,9 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION) license $(COMPONENT_LICENSE_FILE) license=$(COMPONENT_LICENSE) depend type=require fmri=pkg:/runtime/tcl-8@$(IPS_COMPONENT_VERSION) link path=usr/bin/$(MACH32)/wish target=wish$(COMPONENT_MAJOR_VERSION) # To avoid a flag-day when updating Tcl & Tk, bypass here and use a manual # dependency below. file path=usr/bin/$(MACH32)/wish$(COMPONENT_MAJOR_VERSION) \ pkg.depend.bypass-generate=.*libtcl.* link path=usr/bin/$(MACH64)/wish target=wish$(COMPONENT_MAJOR_VERSION) file path=usr/bin/$(MACH64)/wish$(COMPONENT_MAJOR_VERSION) \ pkg.depend.bypass-generate=.*libtcl.* link path=usr/bin/wish target=wish$(COMPONENT_MAJOR_VERSION) link path=usr/bin/wish$(COMPONENT_MAJOR_VERSION) \ target=$(MACH64)/wish$(COMPONENT_MAJOR_VERSION) file path=usr/bin/wish$(COMPONENT_MAJOR_VERSION) file path=usr/include/tk.h file path=usr/include/tkDecls.h file path=usr/include/tkPlatDecls.h @@ -55,11 +46,8 @@ file path=usr/lib/$(MACH64)/libtkstub$(COMPONENT_MAJOR_VERSION).a file path=usr/lib/$(MACH64)/pkgconfig/tk.pc file path=usr/lib/$(MACH64)/tk8.6/pkgIndex.tcl link path=usr/lib/tkConfig.sh target=$(MACH64)/tkConfig.sh file path=usr/lib/$(MACH64)/tkConfig.sh file path=usr/lib/libtk$(COMPONENT_MAJOR_VERSION).so mode=0555 link path=usr/lib/libtk8.5.so target=libtk$(COMPONENT_MAJOR_VERSION).so file path=usr/lib/libtkstub$(COMPONENT_MAJOR_VERSION).a file path=usr/lib/pkgconfig/tk.pc file path=usr/lib/tk$(COMPONENT_MAJOR_VERSION)/bgerror.tcl file path=usr/lib/tk$(COMPONENT_MAJOR_VERSION)/button.tcl file path=usr/lib/tk$(COMPONENT_MAJOR_VERSION)/choosedir.tcl @@ -196,7 +184,6 @@ file path=usr/lib/tk$(COMPONENT_MAJOR_VERSION)/optMenu.tcl file path=usr/lib/tk$(COMPONENT_MAJOR_VERSION)/palette.tcl file path=usr/lib/tk$(COMPONENT_MAJOR_VERSION)/panedwindow.tcl file path=usr/lib/tk$(COMPONENT_MAJOR_VERSION)/pkgIndex.tcl file path=usr/lib/tk$(COMPONENT_MAJOR_VERSION)/safetk.tcl file path=usr/lib/tk$(COMPONENT_MAJOR_VERSION)/scale.tcl file path=usr/lib/tk$(COMPONENT_MAJOR_VERSION)/scrlbar.tcl @@ -233,7 +220,6 @@ file path=usr/lib/tk$(COMPONENT_MAJOR_VERSION)/ttk/xpTheme.tcl file path=usr/lib/tk$(COMPONENT_MAJOR_VERSION)/unsupported.tcl file path=usr/lib/tk$(COMPONENT_MAJOR_VERSION)/xmfbox.tcl file path=usr/lib/tkConfig.sh file path=usr/share/man/man1/wish.1 file path=usr/share/man/man1t/bell.1t file path=usr/share/man/man1t/bind.1t
