Up to [NetBSD + pkgsrc-wip] / pkgsrc / x11 / tk
Request diff between arbitrary revisions - Display revisions graphically
Keyword substitution: kv
Default branch: MAIN
PR/34229 -- Bump API requirement to 8.4.12nb1. Untested.
Add 'clean' to PRIVILEGED_STAGES.
Give up maintainership of packages where I am still listed as MAINTAINER.
Pullup - ticket #2523 - requested by is
tk: make this package work with modular X.org
Revisions pulled up:
x11/tk/Makefile 1.62
x11/tk/distinfo 1.34
x11/tk/patches/patch-ae 1.4
---
Module Name: pkgsrc
Committed By: dsainty
Date: Wed Aug 6 04:09:12 UTC 2008
Modified Files:
pkgsrc/x11/tk: Makefile distinfo
Added Files:
pkgsrc/x11/tk/patches: patch-ae
Log Message:
Tk uses X event numbers to index an "event" array, as well as adding a few of
its own, starting with "VirtualEvent" (Which is correctly set to LASTEvent,
defined in include/X11/X.h). In xproto-7.0.13, a new event "GenericEvent" was
added - making the defined array broken for all of Tk's internal events.
The easy fix is to just add in the missing event into the hard-coded array.
This patch was reported here: http://bugs.gentoo.org/show_bug.cgi?id=225999
A cleaner fix, but a much bigger patch, is listed in the Tk bug tracker. I'm
punting that Tk will have been updated with the fix before X.h grows another
event.
http://sourceforge.net/tracker/index.php?func=detail&aid=2010422&group_id=12997&atid=112997
Bump PKGREVISION.
Tk uses X event numbers to index an "event" array, as well as adding a few of its own, starting with "VirtualEvent" (Which is correctly set to LASTEvent, defined in include/X11/X.h). In xproto-7.0.13, a new event "GenericEvent" was added - making the defined array broken for all of Tk's internal events. The easy fix is to just add in the missing event into the hard-coded array. This patch was reported here: http://bugs.gentoo.org/show_bug.cgi?id=225999 A cleaner fix, but a much bigger patch, is listed in the Tk bug tracker. I'm punting that Tk will have been updated with the fix before X.h grows another event. http://sourceforge.net/tracker/index.php?func=detail&aid=2010422&group_id=12997&atid=112997 Bump PKGREVISION.
Back out previous. Pointed out by uebayasi@ and martti@.
ln -> ${LN}.
Added support for installation to DESTDIR. Approved by Jim Wise.
- convert to modular Xorg
Changes 8.4.14:
* Tk_PhotoPutBlock performance restored (JPEG image loading).
* [namespace inscope] change reverted; harmed Itcl.
* Made [expr {srand(.)}] accept wide integer argument.
* Made [lappend $invalidList] raise an error.
* Improved [text] delete performance.
* Support for the WM_UNICHAR window message on Windows
* Stopped excess variable writes by [scale].
* Tcl_Main no longer blocks main loop start for one interactive command.
* [console] made thread safe.
* Thread-enabled configuration uses MT-safe system calls.
* Many Aqua/Tk bug fixes and improvements, see changes file.
* Made unthreaded notifier naked-fork-safe on Darwin.
* Support for weak linking on Mac OS X.
* msgcat support for CFLocale on Darwin (msgcat 1.3.4)
* Fixed crashes due to alignment issues in encoding translation routines.
* Fixed crash with [listbox -listvariable] on namespace variable.
* Fixed crash when Tcl_DeleteTrace changes proc on the active stack.
* Fixed crash when normalizing filesystem pathnames.
* Fixed crash due to invalid font name from XServer.
* Several 64-bit bugs fixed and platform support enhanced.
Changes 8.4.13:
* Win NT/XP: unicode console support taken back out.
* ${prefix}/share addition to ::tcl_pkgPath undone.
* Warning message for packages with incorrect index scripts silenced.
* Correct syntax error in configure script (bash 3.1 exposes it).
* Tk incompatibilities with SCIM resolved.
* Improved [file writable] support of Windows conventions.
* Tcl_GetIndexFromObj() support for exact matching of empty key.
* Tk Portuguese localization support (pt.msg).
* Tk more robust when X server does not recognize color name "Black".
* Tk_PhotoPutBlock() performance improvement.
* [lsearch -start $pastEnd] no longer finds match at end of list.
* Correct [expr abs($LONG_MIN)] result.
* Correct [string range] failures on some strings containing \x00.
* TCL_EVAL_GLOBAL and [uplevel 0] agreement when traces or [unknown] active.
* Corrections to context of auto-loading the target of an interp alias.
* Corrected some interference between enter and enterstep traces.
* Correct [$img configure -data] failure to change X display.
* Tk_GetBitmapFromData() thread safety.
* Crashes in [grid] for some invalid index arguments.
* Crash when all content of a [text] is elided.
* Crash in [$text edit undo/redo].
* Crash in animated GIF display with variable frame size.
* Crash related to pipe usage in thread-enabled Tcl on Windows.
* Crash when [$text dump -command] changes contents while dumping.
* Crash reading utf-8 when multibyte char spans multiple buffers at EOF.
* Several finalization crashes corrected.
Add link options to have a correct dependency_libs line in .la files on NetBSD. This fixes PR pkg/32915. Bump PKGREVISION.
Recursive revision bump / recommended bump for gettext ABI change.
Changes 8.4.12:
* Repeated [namespace import] of same command now permitted.
* ${prefix}/share added to ::tcl_pkgPath on some systems.
* [exec]'s >> redirection has improved append behavior.
* [info globals] returned only existing variables.
* Recognize some Solaris variations of the cp1251 encoding.
* Addressed [file mkdir] race condition.
* Support opening >2GB files on RHEL 3.
* Corrections to $argv formatting when [encoding system] is multibyte.
* http 2.5.2: Update URL encoding rules to RFC 3986.
* Fixed issue in recursive file delete with NFS lock files.
* Stopped crash after use of Tcl_TraceCommand().
* Win NT/XP: support unicode console.
* Improved support for Tclkit to set [encoding system].
* Added Korean timezone abbreviations.
* Windows: exit codes can now exceed -128..127 range.
* [load] support on LynxOS.
* Packages with incorrect index scripts now cause a warning to be logged.
*** POTENTIAL INCOMPATIBILITY ***
* [lsearch -regexp] now accepts backrefs in the RE.
* [selection get] made compatible with OpenOffice.org.
* Dialog support for widget names containing spaces.
* Improved Tk window manager event interaction on OS X Aqua.
Fixed wrong use of WRKSRC.
libtk84.so contains rpath entries now on FreeBSD and DragonFly, bump revision.
Remove the workaround for installing the man pages into a staged directory. This is not needed for this version of tk. Okayed by maintainer.
Define TK_VERSION in a separate file so that it can be included by other packages such as tcl-tkX, which is currently broken due to the hardcoded Tk version.
Restore original quoting syntax of variables in t{k,cl}Config.sh in order
to follow the principle of least surprise between the packages and the
mainstream builds.
Approved by jwise@.
Bump PKGREVISION of lang/tcl, x11/tk, x11/tk83 to 1 and of lang/tcl83 to 2.
Changes 8.4.11: * Bug fixes
Massive cleanup of buildlink3.mk and builtin.mk files in pkgsrc.
Several changes are involved since they are all interrelated. These
changes affect about 1000 files.
The first major change is rewriting bsd.builtin.mk as well as all of
the builtin.mk files to follow the new example in bsd.builtin.mk.
The loop to include all of the builtin.mk files needed by the package
is moved from bsd.builtin.mk and into bsd.buildlink3.mk. bsd.builtin.mk
is now included by each of the individual builtin.mk files and provides
some common logic for all of the builtin.mk files. Currently, this
includes the computation for whether the native or pkgsrc version of
the package is preferred. This causes USE_BUILTIN.* to be correctly
set when one builtin.mk file includes another.
The second major change is teach the builtin.mk files to consider
files under ${LOCALBASE} to be from pkgsrc-controlled packages. Most
of the builtin.mk files test for the presence of built-in software by
checking for the existence of certain files, e.g. <pthread.h>, and we
now assume that if that file is under ${LOCALBASE}, then it must be
from pkgsrc. This modification is a nod toward LOCALBASE=/usr. The
exceptions to this new check are the X11 distribution packages, which
are handled specially as noted below.
The third major change is providing builtin.mk and version.mk files
for each of the X11 distribution packages in pkgsrc. The builtin.mk
file can detect whether the native X11 distribution is the same as
the one provided by pkgsrc, and the version.mk file computes the
version of the X11 distribution package, whether it's built-in or not.
The fourth major change is that the buildlink3.mk files for X11 packages
that install parts which are part of X11 distribution packages, e.g.
Xpm, Xcursor, etc., now use imake to query the X11 distribution for
whether the software is already provided by the X11 distribution.
This is more accurate than grepping for a symbol name in the imake
config files. Using imake required sprinkling various builtin-imake.mk
helper files into pkgsrc directories. These files are used as input
to imake since imake can't use stdin for that purpose.
The fifth major change is in how packages note that they use X11.
Instead of setting USE_X11, package Makefiles should now include
x11.buildlink3.mk instead. This causes the X11 package buildlink3
and builtin logic to be executed at the correct place for buildlink3.mk
and builtin.mk files that previously set USE_X11, and fixes packages
that relied on buildlink3.mk files to implicitly note that X11 is
needed. Package buildlink3.mk should also include x11.buildlink3.mk
when linking against the package libraries requires also linking
against the X11 libraries. Where it was obvious, redundant inclusions
of x11.buildlink3.mk have been removed.
patch TCL_SRC_DIR and TK_SRC_DIR into tclConfig.sh and tkConfig.sh correctly
Set "LIB_RUNTIME_DIR" in "CONFIGURE_ENV" to make sure that
"${PREFIX}/lib/tclConfig.sh" prints a reasonable value for
"{TCL_CC_SEARCH_FLAGS}" to avoid confusing buildlink3.
Marked pthread as required for NetBSD-1.6.2. Fixed some quoting errors. Approved by jlam.
Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used.
patch tclConfig.sh and tkConfig.sh so that they do not contain references to the build environment, which of course no longer exists once we install the file. Also make sure that variables are set using double quotes, so that variables inside are expanded. Ok jwise@.
Changes 8.4.9: * Fixed segfault in info vars trivial matching branch (new in 8.4.8) * Fixed the treatment of backslashes in file join on Windows * Improved readdir_r detection and usage on unix * Fixed potential unix fileevent issue on 64-bit systems * Remove file normalize on tcl_findLibrary search path uniqification added in 8.4.8 * Ensure tilde paths are not returned specially by 'glob' * Fixed clipping of partially transparent images on buttons on unix to avoid X error * Fix Tk_PhotoPut(Zoomed)Block overlay compositing of partially transparent areas on blank targets
Post-patch removed, since there is no mkLinks script any more
Changes 8.4.8:
* Fixed possible deadlock in Tcl_Finalize
* Fixed thread IDs on 64-bit systems
* Fixed [scan %ld] handling LP64 systems
* Fixed [string map $samevar $samevar] crash
* Fixed broken [namespace forget] logic
* Fixed [namespace import] cycle prevention
* Improved control over int <-> wideInt conversion
* Fixed buffer overflow when there is a syntax error in [subst]
* Fixed [file executable] result for case insensitivity on Windows
* Fixed [expr {NaN == NaN}] result
* Make [tcl_findLibrary] search $::auto_path as well
* Fixed crash in [fconfigure -ttycontrol] in threaded build
* [TIP 222] implementation of [wm attributes -alpha] on Windows
* [TIP 159] implementation of [wm iconphoto]
* Make Tk [load]-able on OS X/Aqua
* Handle color/screen resolution changes on Windows
* Fixed [wm resizable] for Solaris/CDE
* Handle Windows native dialog double clicks that fall through
* Fixed [place forget] memory leak
* Recompute menu geometry on named font size change
* Fixed X/IME IC focus after creation
* Improved multiple display Tk dialog window placement
* Fixed compound buttons for OS X/Aqua
* Documentation improvements and test suite expansion
Libtool fix for PR pkg/26633, and other issues. Update libtool to 1.5.10 in the process. (More information on tech-pkg.) Bump PKGREVISION and BUILDLINK_DEPENDS of all packages using libtool and installing .la files. Bump PKGREVISION (only) of all packages depending directly on the above via a buildlink3 include.
Changes 8.4.7: * Fixed [glob -path] bug when in the root directory * Fixed unicode-char path installation on Windows NT-based platforms * Properly subsitute more values in Windows tclConfig.sh * Improved stack overflow prevention on Windows * Fixed mem leak in [fconfigure $serial -xchar] * Fixed crash with [cd] with a volumerelative $HOME * Fixed clock %G %V formats for ISO8601 week numbers * Fixed support for non-WIDE_INT aware math functions * Added [http::config -urlencoding] option * Fixed utf-8 encoding of \u0000 on system I/O * Prevented dde hangs with non-responsive apps * Added round() wide integer support * Cleaner exit and correction of mem leaks when using the threaded memory allocator and reinitializing * Improved build configuration on 64-bit systems * Added read support of PPM/PGM with the -data option * Correct issue with displaying maximize window button on KDE-3.2.1 * Fix drawing of unicode chars in menu titles on Windows * Correctly post Tk clipboard data to the Windows clipboard on exit * Fix the panedwindow -opaqueresize option to work as per the docs * Reduce Tk tk_messageBox default font size to 14-point * Prevent possible segfault in -maxundo * Fix XIM initialization on Solaris * Complete the implementation of the CG version of the X drawing emulation layer on Mac OS X * Fix several Mac OS X usability issues
Reverse previous commit (disabling thread-safety), which was poorly though through, unacceptably breaks threaded apps, and was made without consulting the package's maintainer. To quote my mail to packages@: I am reversing this change. With this change, tcl is _not_ usable in threaded apps, while without this change, tcl is perfectly usable in non-threaded apps. The fix for a package which is incorrectly written is not to break the package it depends on, but do your job correctly when writing the package. With buildlink3, this is mind-numbingly easy to do. That you neither contacted the maintainer of this package, nor did the buildlink and dependent package changes which your change requires shows that you have not really thought this through. So, as I said, I am reversing this change. Fix your own package, don't break others.
Don't --enable-threads for now. If we do this, all potential users of libtcl.so/libtk.so (whether linking it in or dlopen() it) must be linked against libpthread. This is something we can't guarantee. Fixes bulk build error in py-imagingtk and numerous runtime problems.
Fix up some Makefile logic that got broken by the libtool patches (and prevented it from building on some platforms). Ensure that the built library is named libtk84 (as opposed to libtk8.4) on all platforms.
Fix tcl/tk configure script stupidity: it overwrote the value of LDFLAGS that accumulates within itself with a do-nothing version because it tried to re-use LDFLAGS for another purpose. This broke all library checks after the "checking for ELF" step. Fix this by (duh) not re-using LDFLAGS but by using a different variable. Bump the PKGREVISIONs of lang/tcl and x11/tk. This fixes building the threaded versions of tcl and tk.
Build thread-safe versions of tcl and tk. Bump PKG_REVISION to nb1 to match.
Update Tcl/Tk to 8.4.6.
* Tcl_Obj sharing fixed in [binary scan]
* Updated errno usage for recent glibc
* Fixed [file normalize ~unknownuser] error
* Fixed two memory leaks in VFS code
* Fixed possible infinite loop in TclFinalizeFilesystem
* Updated HP-UX 11 build libraries setup
* Unix std channels forced to exist at startup
* Stopped broken [exec] quoting of '{'
* Fixed memory leak with very long host names
* Corrected level interpretation of Tcl_CreateTrace
* Allow 64-bit configure on IRIX64-6.5*
* Several OS X/Aqua native integration improvements (scrollbar,
event generate, unicode clipboard, tk_messageBox, mousewheel event,
alpha blending for partially transparent images)
* Recognized native hand2/fleur cursors on Windows
* Post menubuttons so they stay on screen better
* Fixed crash during intra-image copy/resize
* New msg catalogs for Esperanto and Polish
* Corrections bold/italic font handling (width calculations) on Windows
* Fixed shrinking grid geometry calculations
Update tk to 8.4.5. Too many changes since 8.3.4. Please see ChangeLog in the distfile.
Replace lang/tcl with lang/tcl83. Packages compatible with 8.4 will be updated to depend on lang/tcl after Tcl/Tk update.
Remove a temporary directory created at post-install, so that a non-root user can 'make clean'. Approved by wiz@.
Set permission of man directories correctly. Approved by wiz@.
Move WRKSRC definition away from the first paragraph in a Makefile.
bl3ify
s/netbsd.org/NetBSD.org/
make ${PAX} usage consistent:
- group 'zrw' and 'p' args, -s last
- use the && operator consistently
- strip unneeded parens
- some whitespace cleanup
Place WRKSRC where it belongs, to make pkglint happy; ok'ed by wiz.
convert to use test target from bsd.pkg.mk addresses PR pkg/19416
Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. This provides sufficient buildlink2 infrastructure to start merging other packages from the buildlink2 branch that have already been converted to use the buildlink2 framework.
Convert to use the buildlink2 framework. Trim any unnecessary changes in the patches or remove them entirely.
Touch a few files that are modified as part of post-build so that they're not rebuilt at install-time. This fixes buildlink leakage for tk noted in pkg/15794.
Update to version 8.3.4 Taken from "changes" from the distribution (minus changes not relevant for NetBSD): 2001-04-04 (doc fixes) numerous doc corrections and clarifications. Update of READMEs. 2001-04-04 (bug fix) corrected reseting of service mode to only occur when it was set (hedin, hobbs) 2001-04-02 (bug fix) Checked for menu deletion before calling associated menu entry command. Fixed listbox, canvas and entry destruction to be more aware of current widget activity. (hobbs) 2001-03-30 (bug fix) handled the error case where a valid-looking but invalid identifier could be passed in certain event generate options causing a crash (hobbs) 2001-03-29 (bug fix) corrected handling of drag-selection (dejong) 2000-10-27 (feature enhancement) made [tk useinputmethods 1] the default for Tk (hobbs) 2000-09-29 (bug fix) corrected BadMatch errors when using Tk on multiple screens (hipp) 2000-08-18 (feature enhancement) Removed redundant call to DitherInstance (melski) 2001-08-24 (bug fix) correct several possible free memory reads and array bounds read errors reported by purify. (hobbs) 2001-08-27 (new feature) added call to Tcl_SetMainLoop which enables Tk to be loaded interactively into tclsh and have the event loop kick in correctly. (hobbs) 2001-08-28 (bug fix) fixed tk_chooseDirectory crash on Win95. (baker) 2001-08-28 (bug fix) removed 2 second 'raise' delay seen by some Unix window managers. (hobbs, baker) 2001-09-14 (bug fix) fixed memory leaks that occured if errors were thrown while initializing the channel for an image. (darley) 2001-10-04 (new feature) added enhanced bgerror dialog from Hipp. (hobbs) 2001-10-17 (bug fix) fixed file filtering in the motif file dialog (nelson)
Get rid of manually adding "nbX" to PKGNAME when a pkg was changed in
pkgsrc. Instead, a new variable PKGREVISION is invented that can get
bumped independent of DISTNAME and PKGNAME.
Example #1:
DISTNAME= foo-X.Y
PKGREVISION= Z
=> PKGNAME= foo-X.YnbZ
Example #2:
DISTNAME= barthing-X.Y
PKGNAME= bar-X.Y
PKGREVISION= Z
=> PKGNAME= bar=X.YnbZ (!)
On subsequent changes, only PKGREVISION needs to be bumped, no more risk
of getting DISTNAME changed accidentally.
I am a triple idiot. The only relevant variable that x11.buildlink.mk
redefines about which buildlink.mk files would care is BUILDLINK_X11_DIR,
which points to the location of the X11R6 hierarchy used during building.
If x11.buildlink.mk isn't included, then BUILDLINK_X11_DIR defaults to
${X11BASE} (set in bsd.pkg.mk), so its value is always safe to use. Remove
the ifdefs surrounding the use of BUILDLINK_X11_DIR in tk/buildlink.mk and
revert changes to move x11.buildlink.mk before the other buildlink.mk files.
x11.buildlink.mk needs to be included before any buildlink.mk files that use X11_BUILDLINK_MK as a test value. Generally just reordering the inclusions so that x11.buildlink.mk comes before the other buildlink.mk files will make everthing work.
Strongly-buildlinkify.
Don't install the short names for section 3 manpages as the names are too generic. Approved by jwise@netbsd.org.
Touch ${TK_LIB_FILE} during build so that it doesn't have to be re-linked
during installation.
Move inclusion of buildlink.mk file below GNU_CONFIGURE and USE_LIBTOOL settings.
Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY.
Fix the installed tkConfig.sh so it's possible to use its values to generate a shared library that depends on libtk83.so. Patch the configure script to set TK_LIB_SPEC to include -Wl,-rpath,... or -R... depending on whether we are ELF or a.out. Bump version number to 8.3.2nb1.
Cleanup MKDIR usage => INSTALL_*_DIR XXX need to teach pkglint to be more picky about this
Update to new COMMENT style: COMMENT var in Makefile instead of pkg/COMMENT.
Depend on tcl>=8.3.2 instead of tcl-8.3.2 now that PKGNAME of tcl is bumped to tcl-8.3.2nb1.
Remove any existing ${PREFIX}/bin/wish symbolic link before creating
a new one. Fixes PR pkg/11233, from Laine Stump, albeit in a different
way, since Solaris disagrees on what "ln -fs" means.
Also install the private tk header file `default.h' to ${PREFIX}/include/tk/generic
as it is needed by mbone/nte.
Add mirror on "ftp.informatik.uni-hamburg.de" to master site list.
Initial import of new pkgsrc/lang/tk (tk-8.3.2) package, partly derived
from the older pkgsrc/lang/tk80 (tk-8.0.5) package.
This is an update of the tk package from version 8.0.5 to version 8.3.2,
and also a slight change in the organization of tcl/tk packages.
This will be added disabled to pkgsrc/x11/Makefile until I finish updating
all tcl/tk-based packags.
Changes from out-of-the-box tk-8.3.2:
Both static and shared libtcl83.* are installed, thanks to
the magic of libtool.
Changes to the package since tk-8.3.2:
A symlink to ${PREFIX}/bin/wish8.3 is installed as ${PREFIX}/bin/wish
This change is designed to allow tk-using packages to not depend on
any particular version of tk.
public tk include files and the tk configuration information script
are now installed in their standard places (${PREFIX}/include/tk*.h,
and ${PREFIX}/lib/tkConfig.sh), and private tcl include files are now
installed in ${PREFIX}/include/tk. This change allows tcl extension
packages to work out of the box, and to not need modification when tcl
and tk are updated. When extension package authors use the new
libtclstubs*.a API, this even allows binary packages of dynamically-
loadable tcl extensions to be used with newer versions of tcl without
recompilation.
Here are the new features in tk-8.3.x as opposed to 8.0.x. I am not including
bug fixes as this represents about 18 months of them.
Img patch from Nijtmans, et al was adopted. This includes a
Tcl_Obj-based image command, support for binary in -data args, adds
an alpha channel to all photo types, as well as GIF write capability.
Major portions of Dash patch from Nijtmans, et al was adopted. This
includes a Tcl_Obj-based canvas command, dashed canvas item support,
enhanced canvas tag searching capabilities, pointer warping with event
-warp, entry widget validation routines, -elide tag option for of the text
widget (TkMan runs on 8.3 without a patch), several new canvas item
arguments, as well as postscript printing support for images and windows in
the canvas.
Listboxes support a -listvariable and have a new itemconfigure
command to color individual items.
Extended "wm state" command to accept a state to set for the toplevel,
and added support for the zoomed (maximized) state on Windows.
Standard Unix dialogs have been updated to use color icons and
have improved behavior.
New "tk useinputmethods" command. This changes the behavior of
Tk on X where X Input Methods (XIM) were recognized and used without
question. With 8.3, they will be recognized and initialized, but
not used unless XIM is turned on (tk useinputmethods 1). This should
only affect users with special input methods, and the new default
behavior should be more beneficial to the average user.
Initial revision