svn commit: r328363 - in head/devel/tkcon: . files

[Pietro Cerutti]

Author: gahr
Date: Thu Sep 26 14:12:56 2013
New Revision: 328363
URL: http://svnweb.freebsd.org/changeset/ports/328363

Log:
  - Convert to USES+=tk
  - 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]

Modified:
  head/devel/tkcon/Makefile
  head/devel/tkcon/files/patch-tkcon.tcl

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

Modified: head/devel/tkcon/files/patch-tkcon.tcl
==============================================================================
--- head/devel/tkcon/files/patch-tkcon.tcl	Thu Sep 26 14:07:08 2013	(r328362)
+++ head/devel/tkcon/files/patch-tkcon.tcl	Thu Sep 26 14:12:56 2013	(r328363)
@@ -1,6 +1,14 @@
 --- tkcon.tcl.orig	2009-02-27 01:17:21.000000000 +0100
-+++ tkcon.tcl	2013-04-16 09:25:50.000000000 +0200
-@@ -194,7 +192,7 @@
++++ tkcon.tcl	2013-09-26 16:10:14.000000000 +0200
+@@ -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 $}
  	HEADURL		{http://tkcon.cvs.sourceforge.net/tkcon/tkcon/tkcon.tcl?rev=HEAD}
  
@@ -9,7 +17,7 @@
  	email		{jeff(a)hobbs(.)org}
  	root		.
  	uid		0
-@@ -1586,8 +1584,8 @@
+@@ -1586,8 +1586,8 @@
      foreach m [list [menu $w.help] [menu $w.pop.help]] {
  	$m add command -label "About " -underline 0 -accel Ctrl-A \
  		-command ::tkcon::About
@@ -20,3 +28,15 @@
  	if {![catch {package require ActiveTcl} ver]} {
  	    set cmd ""
  	    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>