mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00
Code Issues Releases Activity

- Convert to USES+=tk

Browse Source 
- Convert to OPTIONSng
- Import a patch from upstream to avoid new virtual events in Tk 8.6 to mess
  with the history functionality [1]

Obtained from: http://tkcon.cvs.sf.net/viewvc/tkcon/tkcon/tkcon.tcl?r1=1.117&r2=1.118 [1]
This commit is contained in:
Pietro Cerutti 2013-09-26 14:12:56 +00:00
parent 4d50e8a742
commit ed2c5726ef
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=328363
2 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
devel/tkcon/Makefile
View File

@ -9,23 +9,26 @@ MASTER_SITES= SF
MAINTAINER= tcltk@FreeBSD.org MAINTAINER= tcltk@FreeBSD.org
COMMENT= Tk console for Tcl COMMENT= Tk console for Tcl
OPTIONS_DEFINE= DOCS
NO_BUILD= yes NO_BUILD= yes
USE_TK_WRAPPER= yes USES+= tk
PORTDOCS= * PORTDOCS= *
PLIST_FILES= bin/${PORTNAME} PLIST_FILES= bin/${PORTNAME}
NO_STAGE= yes .include <bsd.port.options.mk>
post-patch: post-patch:
@${REINPLACE_CMD} -e \ @${REINPLACE_CMD} -e \
's|%%DOCSDIR%%|${DOCSDIR}|g' ${WRKSRC}/${PORTNAME}.tcl 's|%%DOCSDIR%%|${DOCSDIR}|g; s|%%WISH%%|${WISH}|g' ${WRKSRC}/${PORTNAME}.tcl
do-install: do-install:
${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.tcl ${PREFIX}/bin/${PORTNAME} ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.tcl ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
.if !defined(NOPORTDOCS) .if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR}/README.${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}/README.${PORTNAME}
${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
.endif .endif
.include <bsd.port.mk> .include <bsd.port.mk>

26
devel/tkcon/files/patch-tkcon.tcl
View File

@ -1,6 +1,14 @@
--- tkcon.tcl.orig 2009-02-27 01:17:21.000000000 +0100 --- tkcon.tcl.orig 2009-02-27 01:17:21.000000000 +0100
+++ tkcon.tcl 2013-04-16 09:25:50.000000000 +0200 +++ tkcon.tcl 2013-09-26 16:10:14.000000000 +0200
@@ -194,7 +192,7 @@ @@ -1,6 +1,6 @@
#!/bin/sh
# \
-exec wish "$0" ${1+"$@"}
+exec %%WISH%% "$0" ${1+"$@"}
#
## tkcon.tcl
@@ -194,7 +194,7 @@
RCS {RCS: @(#) $Id: tkcon.tcl,v 1.102 2008/02/07 21:02:53 hobbs Exp $} RCS {RCS: @(#) $Id: tkcon.tcl,v 1.102 2008/02/07 21:02:53 hobbs Exp $}
HEADURL {http://tkcon.cvs.sourceforge.net/tkcon/tkcon/tkcon.tcl?rev=HEAD} HEADURL {http://tkcon.cvs.sourceforge.net/tkcon/tkcon/tkcon.tcl?rev=HEAD}
@ -9,7 +17,7 @@
email {jeff(a)hobbs(.)org} email {jeff(a)hobbs(.)org}
root . root .
uid 0 uid 0
@@ -1586,8 +1584,8 @@ @@ -1586,8 +1586,8 @@
foreach m [list [menu $w.help] [menu $w.pop.help]] { foreach m [list [menu $w.help] [menu $w.pop.help]] {
$m add command -label "About " -underline 0 -accel Ctrl-A \ $m add command -label "About " -underline 0 -accel Ctrl-A \
-command ::tkcon::About -command ::tkcon::About
@ -20,3 +28,15 @@
if {![catch {package require ActiveTcl} ver]} { if {![catch {package require ActiveTcl} ver]} {
set cmd "" set cmd ""
if {$tcl_platform(platform) == "windows"} { if {$tcl_platform(platform) == "windows"} {
@@ -5018,6 +5018,11 @@
## We really didn't want the newline insertion
bind TkConsole <Control-Key-o> {}
+ ## in 8.6b3, the virtual events <<NextLine>> and <<PrevLine>>
+ # mess up our history feature
+ bind TkConsole <<NextLine>> {}
+ bind TkConsole <<PrevLine>> {}
+
## Now make all our virtual event bindings
foreach {ev key} [subst -nocommand -noback {
<<TkCon_Exit>> <Control-q>