2 files changed, 141 insertions, 8 deletions

diff --git a/devel/gdb66/Makefile b/devel/gdb66/Makefile
index 53d8dae59982..5f94d678925f 100644
--- a/devel/gdb66/Makefile
+++ b/devel/gdb66/Makefile
@@ -17,7 +17,7 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:gdb
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	GNU GDB of newer version than comes with the system
 
-OPTIONS=	INSIGHT "Build the Tcl/Tk GUI (broken!)" off
+OPTIONS=	INSIGHT "Build the Tcl/Tk GUI (experimental!)" off
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -27,7 +27,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CONFIGURED_M4=m4 CONFIGURED_BISON=byacc
 CONFIGURE_ARGS=	--program-suffix=${PORTVERSION:S/.//g} \
 		--enable-target=all \
-		--enable-tui --with-libiconv-prefix=${PREFIX}
+		--enable-tui --with-libiconv-prefix=${LOCALBASE}
 CFLAGS:=	${CFLAGS:C/ +$//}	# blanks at EOL creep in sometimes
 CFLAGS+=	-DRL_NO_COMPAT
 EXCLUDE=	dejagnu expect readline sim texinfo intl
@@ -56,10 +56,9 @@ CONFIGURE_ARGS+=--enable-gdbtk \
 
 pre-everything::
 	#
-	# The Tk-based GUI (Insight) is severely broken at the moment.
-	# Do not submit bug-reports, unless you have fixes for them --
-	# insight code needs to be ported to use the most recent ITk and
-	# IWidgets.
+	# The Tk-based GUI (Insight) is patched to work with [incr tcl]
+	# version 3.3 and is currently experimental. Bug reports should
+	# be accompanied by patches.
 	#
 
 pre-configure:
@@ -84,7 +83,7 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gdb/gdb ${PREFIX}/bin/gdb${VER}
 	${LN} ${PREFIX}/bin/gdb${VER} ${PREFIX}/bin/gdbtui${VER}
-	${INSTALL_DATA} ${WRKSRC}/gdb/gdb.1 ${PREFIX}/man/man1/gdb${VER}.1
+	${INSTALL_MAN} ${WRKSRC}/gdb/gdb.1 ${MAN1PREFIX}/man/man1/gdb${VER}.1
 .if defined(WITH_INSIGHT)
 	${LN} ${PREFIX}/bin/gdb${VER} ${PREFIX}/bin/insight
 	${MKDIR} ${PREFIX}/share/redhat/gui
diff --git a/devel/gdb66/files/itcl33-patch b/devel/gdb66/files/itcl33-patch
index 28abeae31f9a..9a1d4d0d94c3 100644
--- a/devel/gdb66/files/itcl33-patch
+++ b/devel/gdb66/files/itcl33-patch
@@ -1,12 +1,18 @@
 --- gdb/gdbtk/library/tfind_args.tcl	Sun Feb  6 19:19:42 2000
 +++ gdb/gdbtk/library/tfind_args.tcl	Wed May 17 00:11:49 2006
-@@ -29,5 +29,5 @@
+@@ -29,9 +29,10 @@
  # ----------------------------------------------------------------------
   
 -itcl_class TfindArgs {
 +itcl::class TfindArgs {
    # ------------------------------------------------------------------
    #  CONSTRUCTOR - create new tfind arguments dialog
+   # ------------------------------------------------------------------
+-  constructor {config} {
++  constructor args {
++    eval configure $args
+     #
+     #  Create a window with the same name as this object
 --- gdb/gdbtk/library/ehandler.itb	Tue Oct 15 17:19:51 2002
 +++ gdb/gdbtk/library/ehandler.itb	Wed May 17 00:12:55 2006
 @@ -23,5 +23,5 @@
@@ -53,3 +59,131 @@
 +  foreach obj [itcl::find objects -isa ManagedWin] {
      if {[$obj isa $win]} {
        lappend res $obj
+--- libgui/library/balloon.tcl	Mon Feb 10 04:21:40 2003
++++ libgui/library/balloon.tcl	Thu Jun 28 15:39:09 2007
+@@ -8,34 +8,34 @@
+ # * Likewise, balloon positioning on Windows is a hack.
+ 
+-itcl_class Balloon {
++itcl::class Balloon {
+   # Name of associated global variable which should be set whenever
+   # the help is shown.
+-  public variable {}
++  public variable variable {}
+ 
+   # Name of associated toplevel.  Private variable.
+-  protected _top {}
++  protected variable _top {}
+ 
+   # This is non-empty if there is an after script pending.  Private
+   # method.
+-  protected _after_id {}
++  protected variable _after_id {}
+ 
+   # This is an array mapping window name to help text.
+-  protected _help_text
++  protected variable _help_text
+ 
+   # This is an array mapping window name to notification proc.
+-  protected _notifiers
++  protected variable _notifiers
+ 
+   # This is set to the name of the parent widget whenever the mouse is
+   # in a widget with balloon help.
+-  protected _active {}
++  protected variable _active {}
+ 
+   # This is true when we're already calling a notification proc.
+   # Private variable.
+-  protected _in_notifier 0
++  protected variable _in_notifier 0
+ 
+   # This holds the parent of the most recently entered widget.  It is
+   # used to determine when the user is moving through a toolbar.
+   # Private variable.
+-  protected _recent_parent {}
++  protected variable _recent_parent {}
+ 
+   constructor {top} {
+--- libgui/library/cframe.tcl	Sat Sep  8 18:34:46 2001
++++ libgui/library/cframe.tcl	Thu Jun 28 15:39:50 2007
+@@ -3,5 +3,5 @@
+ # Written by Tom Tromey <tromey@cygnus.com>.
+ 
+-itcl_class Checkframe {
++itcl::class Checkframe {
+   inherit Widgetframe
+ 
+@@ -14,5 +14,5 @@
+   # trace when the variable changes (or is deleted).  Private
+   # variable.
+-  protected _saved_variable {}
++  protected variable _saved_variable {}
+ 
+   # The checkbutton variable.
+@@ -45,5 +45,5 @@
+   # This holds a list of all widgets which should be immune to
+   # enabling/disabling.  Private variable.
+-  protected _avoid {}
++  protected variable _avoid {}
+ 
+   constructor {config} {
+--- libgui/library/lframe.tcl	Sat Sep  8 18:34:46 2001
++++ libgui/library/lframe.tcl	Thu Jun 28 15:32:04 2007
+@@ -3,5 +3,5 @@
+ # Written by Tom Tromey <tromey@cygnus.com>.
+ 
+-itcl_class Labelledframe {
++itcl::class Labelledframe {
+   inherit Widgetframe
+ 
+--- libgui/library/multibox.tcl	Sat Sep  8 18:34:46 2001
++++ libgui/library/multibox.tcl	Thu Jun 28 15:39:58 2007
+@@ -7,5 +7,5 @@
+ # * Should support itemcget, itemconfigure.
+ 
+-itcl_class Multibox {
++itcl::class Multibox {
+   # The selection mode.
+   public selectmode browse {
+@@ -20,5 +20,5 @@
+   # This is a list of all the listbox widgets we've created.  Private
+   # variable.
+-  protected _listboxen {}
++  protected variable _listboxen {}
+ 
+   # Tricky: take the class bindings for the Listbox widget and turn
+--- libgui/library/sendpr.tcl	Tue Feb  5 18:16:14 2002
++++ libgui/library/sendpr.tcl	Thu Jun 28 15:32:04 2007
+@@ -14,5 +14,5 @@
+ defarray SENDPR_state
+ 
+-itcl_class Sendpr {
++itcl::class Sendpr {
+   inherit Ide_window
+ 
+--- libgui/library/ventry.tcl	Sat Sep  8 18:34:46 2001
++++ libgui/library/ventry.tcl	Thu Jun 28 15:32:04 2007
+@@ -3,5 +3,5 @@
+ # Written by Tom Tromey <tromey@cygnus.com>.
+ 
+-itcl_class Validated_entry {
++itcl::class Validated_entry {
+   # The validation command.  It is passed the contents of the entry.
+   # It should throw an error if there is a problem; the error text
+--- libgui/library/wframe.tcl	Sat Sep  8 18:34:46 2001
++++ libgui/library/wframe.tcl	Thu Jun 28 15:40:07 2007
+@@ -3,5 +3,5 @@
+ # Written by Tom Tromey <tromey@cygnus.com>.
+ 
+-itcl_class Widgetframe {
++itcl::class Widgetframe {
+   # Where to put the widget.  For now, we don't support many anchors.
+   # Augment as you like.
+@@ -15,5 +15,5 @@
+   # The name of the widget to put on the frame.  This is set by some
+   # subclass calling the _add method.  Private variable.
+-  protected _widget {}
++  protected variable _widget {}
+ 
+   constructor {config} {