- Use itcl as a dependency instead of itk.

- Include extra patches from master web site fixing various problems.
- Use FreeBSD-specific utils (e.g. 'vipw' instead of 'vi /etc/passwd') or
  correct non-FreeBSD flags to system programs (e.g. 'du -D' will not work on
  FreeBSD).

PR:		18725
Submitted by:	Andy Sparrow <andy@geek4food.org>

9 files changed, 140 insertions, 2 deletions

diff --git a/x11-fm/tkdesk/Makefile b/x11-fm/tkdesk/Makefile
index bb6e4a508c12..8d215a46307f 100644
--- a/x11-fm/tkdesk/Makefile
+++ b/x11-fm/tkdesk/Makefile
@@ -12,9 +12,9 @@ MASTER_SITES=	http://sd.znet.com/~jchris/tkdesk/ \
 		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR= X11/desktop
 
-MAINTAINER=	dmlb@ragnet.demon.co.uk
+MAINTAINER=	andy@geek4food.org
 
-LIB_DEPENDS=	itk30.1:${PORTSDIR}/x11-toolkits/itk \
+LIB_DEPENDS=	itcl30.1:${PORTSDIR}/lang/itcl \
 		BLT24.2:${PORTSDIR}/x11-toolkits/blt
 
 USE_GMAKE=	YES
@@ -26,6 +26,9 @@ CONFIGURE_ARGS+= --with-blt=${LOCALBASE}/lib
 
 MAN1=		tkdesk.1 cd-tkdesk.1 ed-tkdesk.1 od-tkdesk.1
 
+pre-install:
+	@find ${WRKSRC} -type f -name '*.orig' -exec ${RM} -f {} ';'
+
 post-install:
 	strip ${PREFIX}/bin/tkdesksh
 	strip ${PREFIX}/bin/tkdeskclient
diff --git a/x11-fm/tkdesk/files/patch-ac b/x11-fm/tkdesk/files/patch-ac
new file mode 100644
index 000000000000..02b67c0c2444
--- /dev/null
+++ b/x11-fm/tkdesk/files/patch-ac
@@ -0,0 +1,29 @@
+--- tcldesk/configs/AppBar.orig	Sun Nov 14 14:07:53 1999
++++ tcldesk/configs/AppBar	Thu Apr 27 21:48:58 2000
+@@ -282,7 +282,7 @@
+     	{{TkDesk User's Guide } {dsk_help guide}}
+     	{{FAQ } {dsk_help faq}}
+     	{{Changes} {dsk_help changes}}
+-	{{TkDesk Homepage } {dsk_netscape url http://people.mainz.netsurf.de/~bolik/tkdesk/ window}}
++	{{TkDesk Homepage } {dsk_netscape url http://sd.znet.com/~jchris/tkdesk/ window}}
+     	-
+     	{{Manual Page ...} {
+     		dsk_read_string {Show manual page for: (e.g. col(1))} {
+@@ -392,7 +392,7 @@
+     	    }
+ 	}
+ 	{{Superuser}
+-	    {{Edit password file} {dsk_exec_as_root vi /etc/passwd}}
++	    {{Edit password file} {dsk_exec_as_root vipw}}
+ 	    {{Edit /etc/hosts} {dsk_exec_as_root vi /etc/hosts}}
+ 	}
+ 	-
+@@ -476,7 +476,7 @@
+ 	    }}
+ 	}
+ 	{{Locations}
+-	    {{TkDesk Homepage } {dsk_netscape url http://people.mainz.netsurf.de/~bolik/tkdesk/ window}}
++	    {{TkDesk Homepage } {dsk_netscape url http://sd.znet.com/~jchris/tkdesk/ window}}
+ 	    {{AltaVista } {dsk_netscape url http://www.altavista.digital.com window}}
+ 	    {{Tcl/Tk at Sun } {dsk_netscape url http://www.sunlabs.com/research/tcl window}}
+ 	}
diff --git a/x11-fm/tkdesk/files/patch-ad b/x11-fm/tkdesk/files/patch-ad
new file mode 100644
index 000000000000..1b8e74b123e5
--- /dev/null
+++ b/x11-fm/tkdesk/files/patch-ad
@@ -0,0 +1,20 @@
+--- tcldesk/configs/AppBar_Be.orig	Sun Nov 14 14:07:53 1999
++++ tcldesk/configs/AppBar_Be	Thu Apr 27 21:48:34 2000
+@@ -241,7 +241,7 @@
+     	{{TkDesk User's Guide } {dsk_help guide}}
+     	{{FAQ } {dsk_help faq}}
+     	{{Changes} {dsk_help changes}}
+-	{{TkDesk Homepage } {dsk_netscape url http://people.mainz.netsurf.de/~bolik/tkdesk/ window}}
++	{{TkDesk Homepage } {dsk_netscape url http://sd.znet.com/~jchris/tkdesk/ window}}
+     	-
+     	{{Manual Page ...} {
+     		dsk_read_string {Show manual page for: (e.g. col(1))} {
+@@ -333,7 +333,7 @@
+ 	    }}
+ 	}
+ 	{{Locations}
+-	    {{TkDesk Homepage } {dsk_netscape url http://people.mainz.netsurf.de/~bolik/tkdesk/ window}}
++	    {{TkDesk Homepage } {dsk_netscape url http://sd.znet.com/~jchris/tkdesk/ window}}
+ 	    {{AltaVista } {dsk_netscape url http://www.altavista.digital.com window}}
+ 	    {{Tcl/Tk at Sun } {dsk_netscape url http://www.sunlabs.com/research/tcl window}}
+ 	}
diff --git a/x11-fm/tkdesk/files/patch-ae b/x11-fm/tkdesk/files/patch-ae
new file mode 100644
index 000000000000..5660ab4fb7d1
--- /dev/null
+++ b/x11-fm/tkdesk/files/patch-ae
@@ -0,0 +1,11 @@
+--- tcldesk/configs/System.orig	Sat Apr 29 18:20:13 2000
++++ tcldesk/configs/System	Sat Apr 29 18:21:05 2000
+@@ -132,7 +132,7 @@
+ ### most cases).
+ 
+ set tkdesk(cmd,whoami) "whoami"		;# used to determine user's login name
+-set tkdesk(cmd,du) "du -Dk"		        ;# for Disk Usage: usage in KB
++set tkdesk(cmd,du) "du -k"		        ;# for Disk Usage: usage in KB
+ set tkdesk(cmd,df) "df"			;# for getting free disk space in KB
+ set tkdesk(cmd,sort) "sort -rn"		;# for Disk Usage: list biggest first
+ set tkdesk(cmd,cp) "cp -r"		;# copy recursively
diff --git a/x11-fm/tkdesk/files/patch-af b/x11-fm/tkdesk/files/patch-af
new file mode 100644
index 000000000000..3a97c00b0a31
--- /dev/null
+++ b/x11-fm/tkdesk/files/patch-af
@@ -0,0 +1,17 @@
+--- tcldesk/appbar.tcl.orig	Sun Nov 14 16:07:47 1999
++++ tcldesk/appbar.tcl	Sun May 28 16:30:32 2000
+@@ -631,12 +631,13 @@
+     }
+ }
+ 
+-proc _appbar_dd_action {cmd flist} {
++proc _appbar_dd_action {cmd args} {
+     global tkdesk
+ 
+     catch "wm withdraw $tkdesk(dd_token_window)"
+     update
+     
++    set flist $args
+     if {[string first %A $cmd] > -1} {
+ 	set cmd [string_replace $cmd %A $flist]
+     } else {
diff --git a/x11-fm/tkdesk/files/patch-ag b/x11-fm/tkdesk/files/patch-ag
new file mode 100644
index 000000000000..93824307eec4
--- /dev/null
+++ b/x11-fm/tkdesk/files/patch-ag
@@ -0,0 +1,21 @@
+--- tcldesk/delete.tcl.orig	Sun Nov 14 16:07:47 1999
++++ tcldesk/delete.tcl	Sun May 28 16:30:32 2000
+@@ -381,12 +381,12 @@
+ 	if {[cb_okcancel "Empty trash can?\nThis will delete ALL files in the trash can!"] == 0} {
+ 	    dsk_sound dsk_really_deleting
+ 	    if {$anum == 1} {set fll "File"} {set fll "Files"}
+-	    #set tlist ""
+-	    #foreach f $alist {
+-	    #	 lappend tlist [string trimright \
+-	    #		 $tkdesk(trashdir)/$f " "]
+-	    #}
+-	    dsk_bgexec "$tkdesk(cmd,rm) .* *" "Deleting $anum $fll..."
++	    set tlist ""
++	    foreach f $alist {
++	    	 lappend tlist [string trimright \
++	    		 $tkdesk(trashdir)/$f " "]
++	    }
++	    dsk_bgexec "$tkdesk(cmd,rm) $tlist" "Deleting $anum $fll..."
+ 	    dsk_refresh $tkdesk(trashdir)
+ 	}
+     }
diff --git a/x11-fm/tkdesk/files/patch-ah b/x11-fm/tkdesk/files/patch-ah
new file mode 100644
index 000000000000..5e29282a4cc4
--- /dev/null
+++ b/x11-fm/tkdesk/files/patch-ah
@@ -0,0 +1,24 @@
+--- tkdesk.main.orig	Sun Nov 14 16:07:45 1999
++++ tkdesk.main	Sun May 28 16:30:32 2000
+@@ -682,6 +682,12 @@
+     blt_drag&drop errors ""
+ }
+ 
++# Disable BLT's built-in d&d bindings (except for motion):
++catch {
++    bind BltDrag&DropButton2 <Button-2> {}
++    bind BltDrag&DropButton2 <ButtonRelease-2> {}
++}
++
+ #
+ # ====  Set misc. global variables ============================================
+ #
+@@ -1004,7 +1010,7 @@
+     }
+ 
+     foreach obj [itcl_info objects -class dsk_Editor] {
+-	if [winfo exists $obj] {
++	if [winfo exists [$obj getToplevel]] {
+ 	    if {[$obj close_win] == "cancel"} {
+ 		return
+ 	    }
diff --git a/x11-fm/tkdesk/files/patch-ai b/x11-fm/tkdesk/files/patch-ai
new file mode 100644
index 000000000000..84df1abdce5e
--- /dev/null
+++ b/x11-fm/tkdesk/files/patch-ai
@@ -0,0 +1,11 @@
+--- tcldesk/find.tcl.orig	Sun Nov 14 16:07:47 1999
++++ tcldesk/find.tcl	Sun May 28 16:30:32 2000
+@@ -805,7 +805,7 @@
+     set flist ""
+     set list [$dlb get]
+     foreach f $fl {
+-	lappend flist [lindex [lindex $list $f] 0]
++	lappend flist [lindex [split [lindex $list $f] \t] 0]
+     }
+ 
+     set nfiles 0
diff --git a/x11-fm/tkdesk/pkg-descr b/x11-fm/tkdesk/pkg-descr
index 6ce83b4547c5..2ba830ff91ef 100644
--- a/x11-fm/tkdesk/pkg-descr
+++ b/x11-fm/tkdesk/pkg-descr
@@ -1,2 +1,4 @@
   TkDesk is a graphical, highly configurable and powerful file manager
   for Unix and the X Window System.
+
+WWW: http://sd.znet.net/~jchris/tkdesk