Date: Sun, 21 May 2000 15:49:57 -0700 (PDT) From: <andy@geek4food.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/18725: TkDesk 1.2 update Message-ID: <200005212249.PAA87419@mega.geek4food.org>
next in thread | raw e-mail | index | archive | help
>Number: 18725
>Category: ports
>Synopsis: extra patches, correct dependancy
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun May 21 15:50:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: Andy Sparrow
>Release: FreeBSD 4.0-STABLE i386
>Organization:
None Discernible
>Environment:
4.0-STABLE FreeBSD 4.0-STABLE #0: Wed Apr 26 14:33:22 PDT 2000
and 3.4-STABLE
>Description:
Current TkDesk 1.2 port:
* identifies itk-3.0.1 as dependancy (should be itcl-3.0.1).
* does not include extra patches from master web site fixing various problems.
* does not 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).
* does not update 'README.html' (refers to old packages XFree 3.3.3.1, gmake 3.77, tcl 7.6,
tk-4.2, and does not reference new dependancies blt-2.4 or itcl-3.0.1)
>How-To-Repeat:
Install the port, use.
>Fix:
Patches attached.
diff -ruN tkdesk/Makefile tkdesk.new/Makefile
--- tkdesk/Makefile Mon May 1 10:58:33 2000
+++ tkdesk.new/Makefile Sun May 21 12:28:02 2000
@@ -12,9 +12,9 @@
${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
@@ -25,6 +25,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
diff -ruN tkdesk/README.html tkdesk.new/README.html
--- tkdesk/README.html Mon May 17 19:30:22 1999
+++ tkdesk.new/README.html Sat May 20 16:00:57 2000
@@ -3,7 +3,7 @@
<head><h1> The FreeBSD Ports Collection ("x11-fm/tkdesk")</h1> </head> <hr>
<body>
-<p>You are now in the directory for the port "x11-fm/tkdesk" (package name "tkdesk-1.1").
+<p>You are now in the directory for the port "x11-fm/tkdesk" (package name "tkdesk-1.2").
<p>This is the one-line description for this port:
@@ -18,9 +18,9 @@
a summary on how to use the ports collection.
<p>
-This port requires package(s) "XFree86-3.3.3.1 gmake-3.77 tcl-7.6 tk-4.2" to build.
+This port requires package(s) "XFree86-3.3.6 gmake-3.79 tcl-8.2.3 tk-8.2.3 itcl-3.0.1 blt-2.4m" to build.
<p>
-This port requires package(s) "XFree86-3.3.3.1 tcl-7.6 tk-4.2" to run.
+This port requires package(s) "XFree86-3.3.6 tcl-8.2.3 tk-8.2.3 itcl-3.0.1 blt-2.4m" to run.
<p><hr><p>
<a href="../README.html"> Go up one level</a>
diff -ruN tkdesk/patches/patch-ac tkdesk.new/patches/patch-ac
--- tkdesk/patches/patch-ac Wed Dec 31 16:00:00 1969
+++ tkdesk.new/patches/patch-ac Sat May 20 16:31:02 2000
@@ -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 -ruN tkdesk/patches/patch-ad tkdesk.new/patches/patch-ad
--- tkdesk/patches/patch-ad Wed Dec 31 16:00:00 1969
+++ tkdesk.new/patches/patch-ad Sat May 20 16:31:32 2000
@@ -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 -ruN tkdesk/patches/patch-ae tkdesk.new/patches/patch-ae
--- tkdesk/patches/patch-ae Wed Dec 31 16:00:00 1969
+++ tkdesk.new/patches/patch-ae Sat May 20 16:32:07 2000
@@ -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 -ruN tkdesk/patches/patch-af tkdesk.new/patches/patch-af
--- tkdesk/patches/patch-af Wed Dec 31 16:00:00 1969
+++ tkdesk.new/patches/patch-af Sat May 20 16:24:22 2000
@@ -0,0 +1,30 @@
+*** tcldesk/appbar.tcl.orig Sun Nov 14 23:07:47 1999
+--- tcldesk/appbar.tcl Mon Nov 15 15:20:10 1999
+***************
+*** 631,642 ****
+ }
+ }
+
+! proc _appbar_dd_action {cmd flist} {
+ global tkdesk
+
+ catch "wm withdraw $tkdesk(dd_token_window)"
+ update
+
+ if {[string first %A $cmd] > -1} {
+ set cmd [string_replace $cmd %A $flist]
+ } else {
+--- 631,643 ----
+ }
+ }
+
+! 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 -ruN tkdesk/patches/patch-ag tkdesk.new/patches/patch-ag
--- tkdesk/patches/patch-ag Wed Dec 31 16:00:00 1969
+++ tkdesk.new/patches/patch-ag Sat May 20 16:27:26 2000
@@ -0,0 +1,29 @@
+*** tcldesk/delete.tcl.orig Sun Nov 14 14:07:47 1999
+--- tcldesk/delete.tcl Thu Nov 18 23:39:04 1999
+***************
+*** 381,392 ****
+ 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..."
+ dsk_refresh $tkdesk(trashdir)
+ }
+ }
+--- 381,392 ----
+ 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) $tlist" "Deleting $anum $fll..."
+ dsk_refresh $tkdesk(trashdir)
+ }
+ }
diff -ruN tkdesk/patches/patch-ah tkdesk.new/patches/patch-ah
--- tkdesk/patches/patch-ah Wed Dec 31 16:00:00 1969
+++ tkdesk.new/patches/patch-ah Sat May 20 16:06:23 2000
@@ -0,0 +1,34 @@
+*** tkdesk.main.orig Sun Nov 14 23:07:45 1999
+--- tkdesk.main Mon Jan 24 21:47:44 2000
+***************
+*** 682,687 ****
+--- 682,693 ----
+ 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,1010 ****
+ }
+
+ foreach obj [itcl_info objects -class dsk_Editor] {
+! if [winfo exists $obj] {
+ if {[$obj close_win] == "cancel"} {
+ return
+ }
+--- 1010,1016 ----
+ }
+
+ foreach obj [itcl_info objects -class dsk_Editor] {
+! if [winfo exists [$obj getToplevel]] {
+ if {[$obj close_win] == "cancel"} {
+ return
+ }
diff -ruN tkdesk/patches/patch-ai tkdesk.new/patches/patch-ai
--- tkdesk/patches/patch-ai Wed Dec 31 16:00:00 1969
+++ tkdesk.new/patches/patch-ai Sat May 20 16:27:50 2000
@@ -0,0 +1,19 @@
+*** tcldesk/find.tcl.orig Sun Nov 14 23:07:47 1999
+--- tcldesk/find.tcl Mon Nov 15 15:32:35 1999
+***************
+*** 805,811 ****
+ set flist ""
+ set list [$dlb get]
+ foreach f $fl {
+! lappend flist [lindex [lindex $list $f] 0]
+ }
+
+ set nfiles 0
+--- 805,812 ----
+ set flist ""
+ set list [$dlb get]
+ foreach f $fl {
+! lappend flist [lindex [split [lindex $list $f] \t] 0]
+ }
+
+ set nfiles 0
diff -ruN tkdesk/pkg/DESCR tkdesk.new/pkg/DESCR
--- tkdesk/pkg/DESCR Fri Aug 2 12:57:31 1996
+++ tkdesk.new/pkg/DESCR Sat May 20 16:01:53 2000
@@ -1,2 +1,4 @@
TkDesk is a graphical, highly configurable and powerful file manager
for Unix and the X Window System.
+
+ See http://sd.znet.net/~jchris/tkdesk
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200005212249.PAA87419>