Date: Mon, 1 May 2000 22:04:37 +0000 (GMT) From: andy@geek4food.org To: FreeBSD-gnats-submit@freebsd.org Subject: ports/18333: TkDesk 1.2 Update (patches included). Message-ID: <20000501220437.9F74E42A@BSDpc.geek4food.org>
next in thread | raw e-mail | index | archive | help
>Number: 18333 >Category: ports >Synopsis: TkDesk port is old (patches included) >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: Mon May 1 15:10:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Andy Sparrow >Release: FreeBSD 3.4-STABLE i386 >Organization: None discernable. >Environment: FreeBSD mega.geek4food.org 4.0-STABLE FreeBSD 4.0-STABLE #0: Wed Apr 26 14:33:22 PDT 2000 And 3.4-STABLE and 5.0-CURRENT. >Description: TkDesk in 'ports' is very old (version 1.1, uses Tcl 7.6 and Tk 4.2). Current version is 1.2 (uses Tcl/Tk 8.2). >How-To-Repeat: Install tkdesk from ports. >Fix: Generally updated to TkDesk 1.2 and latest patches, update dependancies to Tcl/Tk 8.2 (tested with 8.2.2 and 8.2.3) include itcl 3.0.1, fix some FreeBSD-specific niggles (bad options to system commands), update HTTP links. diff -ruN tkdesk/Makefile tkdesk1.2/Makefile --- tkdesk/Makefile Sun Apr 23 14:19:41 2000 +++ tkdesk1.2/Makefile Sun Apr 30 22:09:07 2000 @@ -6,20 +6,31 @@ # PORTNAME= tkdesk -PORTVERSION= 1.1 -CATEGORIES= x11-fm tk42 -MASTER_SITES= http://people.mainz.netsurf.de/~bolik/tkdesk/ +PORTVERSION= 1.2 +CATEGORIES= x11-fm tk82 +MASTER_SITES= http://sd.znet.com/~jchris/tkdesk/ MAINTAINER= dmlb@ragnet.demon.co.uk -LIB_DEPENDS= tk42.1:${PORTSDIR}/x11-toolkits/tk42 +LIB_DEPENDS= itcl30.1:${PORTSDIR}/lang/itcl \ + tk82.1:${PORTSDIR}/x11-toolkits/tk82 USE_GMAKE= YES GNU_CONFIGURE= YES -CONFIGURE_ENV+= TCLCONF_PATH=${LOCALBASE}/lib/tcl7.6 -CONFIGURE_ENV+= TKCONF_PATH=${LOCALBASE}/lib/tk4.2 +CONFIGURE_ENV+= TCLCONF_PATH=${LOCALBASE}/lib/tcl8.2 +CONFIGURE_ENV+= TKCONF_PATH=${LOCALBASE}/lib/tk8.2 +CONFIGURE_ENV+= ITCLCONF_PATH=${LOCALBASE}/lib/itcl3.0 MAN1= tkdesk.1 cd-tkdesk.1 ed-tkdesk.1 od-tkdesk.1 + +DISTNAME = ${PORTNAME}-${PORTVERSION} +DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \ + ${DISTNAME}.fixes${EXTRACT_SUFX} + +EXTRA_PATCHES = ${WRKDIR}/*.diff + +pre-install: + @find ${WRKSRC} -type f -name '*.orig' -exec ${RM} -f {} ';' post-install: strip ${PREFIX}/bin/tkdesksh diff -ruN tkdesk/README.html tkdesk1.2/README.html --- tkdesk/README.html Mon Feb 15 01:12:52 1999 +++ tkdesk1.2/README.html Thu Apr 27 23:00:19 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.78.1 tcl-8.2 tk-8.2" 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 tk-8.2" to run. <p><hr><p> <a href="../README.html"> Go up one level</a> diff -ruN tkdesk/files/md5 tkdesk1.2/files/md5 --- tkdesk/files/md5 Fri Oct 9 20:22:39 1998 +++ tkdesk1.2/files/md5 Sun Apr 30 22:13:57 2000 @@ -1 +1,2 @@ -MD5 (tkdesk-1.1.tar.gz) = 4ac95c572a662709f7f575ad3544afc3 +MD5 (tkdesk-1.2.tar.gz) = 33aa10a3d3b51017cdd495886848a2a6 +MD5 (tkdesk-1.2.fixes.tar.gz) = 4ab595fe11323683a40329d8912152ba diff -ruN tkdesk/patches/patch-aa tkdesk1.2/patches/patch-aa --- tkdesk/patches/patch-aa Thu Dec 30 17:02:59 1999 +++ tkdesk1.2/patches/patch-aa Thu Apr 27 22:14:58 2000 @@ -1,6 +1,14 @@ ---- configure~ Sun Sep 20 20:41:40 1998 -+++ configure Sun Dec 20 10:57:19 1998 -@@ -647,8 +647,8 @@ +--- configure.orig Sun Nov 14 14:07:45 1999 ++++ configure Thu Apr 27 22:03:28 2000 +@@ -739,14 +739,14 @@ + # + # ----------------------------------------------------------------------- + if test "$ITCL_VERSION" != "no" ; then +- TCL_INCLUDE_PATH=$TCL_EXEC_PREFIX/include +- TK_INCLUDE_PATH=$TCL_INCLUDE_PATH ++ TCL_INCLUDE_PATH=$TCL_EXEC_PREFIX/include/tcl${TCL_VERSION} ++ TK_INCLUDE_PATH=$TK_EXEC_PREFIX/include/tk${TK_VERSION} + NEED_ITCL_LIB= # ITCL_LIB_SPEC already set in itclConfig.sh ITCL_LIB_STATIC=${TCLCONF_PATH}/libitcl${ITCL_VERSION}.a else diff -ruN tkdesk/patches/patch-ab tkdesk1.2/patches/patch-ab --- tkdesk/patches/patch-ab Sat Feb 13 11:29:10 1999 +++ tkdesk1.2/patches/patch-ab Thu Apr 27 22:16:57 2000 @@ -1,11 +1,11 @@ ---- Makefile.in~ Sun Sep 20 20:41:40 1998 -+++ Makefile.in Sat Feb 13 12:53:36 1999 -@@ -194,7 +194,7 @@ +--- Makefile.in.orig Sun Nov 14 14:07:45 1999 ++++ Makefile.in Thu Apr 27 22:03:28 2000 +@@ -201,7 +201,7 @@ find $(SCRIPT_INSTALL_DIR) -type f -exec chmod a+r {} \; find $(SCRIPT_INSTALL_DIR) -type d -exec chmod a+rx {} \; @echo "=== Creating index..." - cd $(SCRIPT_INSTALL_DIR); $(BIN_INSTALL_DIR)/tkdesksh mkindex -+ cd $(SCRIPT_INSTALL_DIR); tclsh7.6 mkindex ++ cd $(SCRIPT_INSTALL_DIR); tclsh8.2 mkindex @echo "=== Installing the manual pages..." @for f in tkdesk.1 cd-tkdesk.1 ed-tkdesk.1 od-tkdesk.1; do \ echo "installing $$f" ;\ diff -ruN tkdesk/patches/patch-ac tkdesk1.2/patches/patch-ac --- tkdesk/patches/patch-ac Wed Dec 31 16:00:00 1969 +++ tkdesk1.2/patches/patch-ac Thu Apr 27 22:19:24 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 tkdesk1.2/patches/patch-ad --- tkdesk/patches/patch-ad Wed Dec 31 16:00:00 1969 +++ tkdesk1.2/patches/patch-ad Thu Apr 27 22:19:43 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 tkdesk1.2/patches/patch-ae --- tkdesk/patches/patch-ae Wed Dec 31 16:00:00 1969 +++ tkdesk1.2/patches/patch-ae Sat Apr 29 18:22:19 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/pkg/DESCR tkdesk1.2/pkg/DESCR --- tkdesk/pkg/DESCR Fri Aug 2 12:57:31 1996 +++ tkdesk1.2/pkg/DESCR Sat Apr 29 19:31:09 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.com/~jchris/tkdesk diff -ruN tkdesk/pkg/PLIST tkdesk1.2/pkg/PLIST --- tkdesk/pkg/PLIST Fri Oct 9 20:22:43 1998 +++ tkdesk1.2/pkg/PLIST Sat Apr 29 18:17:28 2000 @@ -1,10 +1,10 @@ -bin/cd-tkdesk -bin/ed-tkdesk bin/od-tkdesk -bin/op-tkdesk bin/pauseme -bin/pop-tkdesk bin/tkdesk +bin/ed-tkdesk +bin/cd-tkdesk +bin/op-tkdesk +bin/pop-tkdesk bin/tkdeskclient bin/tkdesksh lib/TkDesk/Common.tcl @@ -13,9 +13,11 @@ lib/TkDesk/Editor.tcl lib/TkDesk/FileInfo.tcl lib/TkDesk/FileListbox.tcl +lib/TkDesk/Frame.tcl lib/TkDesk/HistEntry.tcl lib/TkDesk/List.tcl lib/TkDesk/Periodic.tcl +lib/TkDesk/Toplevel.tcl lib/TkDesk/Viewer.tcl lib/TkDesk/action.tcl lib/TkDesk/annotations.tcl @@ -25,6 +27,8 @@ lib/TkDesk/appbar-mail.tcl lib/TkDesk/appbar-trash.tcl lib/TkDesk/appbar.tcl +lib/TkDesk/bltDnd.tcl +lib/TkDesk/bltDragdrop.tcl lib/TkDesk/bookmarks.tcl lib/TkDesk/cb_tools/bindings.tcl lib/TkDesk/cb_tools/bitmaps/combo.xbm @@ -69,8 +73,6 @@ @exec chmod 755 %B/.trash lib/TkDesk/copy.tcl lib/TkDesk/cpanels.tcl -lib/TkDesk/dd-file.tcl -lib/TkDesk/dd-text.tcl lib/TkDesk/delete.tcl lib/TkDesk/diary.tcl lib/TkDesk/doc/CHANGES @@ -78,6 +80,8 @@ lib/TkDesk/doc/License lib/TkDesk/doc/QuickStart lib/TkDesk/doc/guide-1.html +lib/TkDesk/doc/guide-10.html +lib/TkDesk/doc/guide-11.html lib/TkDesk/doc/guide-2.html lib/TkDesk/doc/guide-3.html lib/TkDesk/doc/guide-4.html @@ -86,10 +90,9 @@ lib/TkDesk/doc/guide-7.html lib/TkDesk/doc/guide-8.html lib/TkDesk/doc/guide-9.html -lib/TkDesk/doc/guide-10.html -lib/TkDesk/doc/guide-11.html lib/TkDesk/doc/guide.html lib/TkDesk/dsk_Listbox.tcl +lib/TkDesk/envedit.tcl lib/TkDesk/file_ops.tcl lib/TkDesk/find.tcl lib/TkDesk/help.tcl @@ -192,10 +195,12 @@ lib/TkDesk/images/ficons16/gif2.xpm lib/TkDesk/images/ficons16/h.xpm lib/TkDesk/images/ficons16/html.xpm +lib/TkDesk/images/ficons16/html2.xpm lib/TkDesk/images/ficons16/image.xpm lib/TkDesk/images/ficons16/mini-comet.xpm lib/TkDesk/images/ficons16/music.xpm lib/TkDesk/images/ficons16/parcel.xpm +lib/TkDesk/images/ficons16/pdf.xpm lib/TkDesk/images/ficons16/prism.xpm lib/TkDesk/images/ficons16/rpm.xpm lib/TkDesk/images/ficons16/script.xpm @@ -313,6 +318,7 @@ lib/TkDesk/images/next/Write.xpm lib/TkDesk/images/next/WriteMail.xpm lib/TkDesk/images/next/adder.xpm +lib/TkDesk/images/next/applix.xpm lib/TkDesk/images/next/bag.xpm lib/TkDesk/images/next/bag_full.xpm lib/TkDesk/images/next/bargraph.xpm @@ -525,39 +531,41 @@ lib/TkDesk/sounds/newmail.au lib/TkDesk/sounds/robot_dead.au lib/TkDesk/sounds/start.au +lib/TkDesk/static/itcl3.0/itcl.tcl +lib/TkDesk/static/itcl3.0/pkgIndex.tcl +lib/TkDesk/static/tcl8.0/history.tcl +lib/TkDesk/static/tcl8.0/init.tcl +lib/TkDesk/static/tcl8.0/ldAix +lib/TkDesk/static/tcl8.0/ldAout.tcl +lib/TkDesk/static/tcl8.0/parray.tcl +lib/TkDesk/static/tcl8.0/safe.tcl +lib/TkDesk/static/tcl8.0/tclIndex +lib/TkDesk/static/tcl8.0/word.tcl +lib/TkDesk/static/tk8.0/bgerror.tcl +lib/TkDesk/static/tk8.0/button.tcl +lib/TkDesk/static/tk8.0/clrpick.tcl +lib/TkDesk/static/tk8.0/comdlg.tcl +lib/TkDesk/static/tk8.0/console.tcl +lib/TkDesk/static/tk8.0/dialog.tcl +lib/TkDesk/static/tk8.0/entry.tcl +lib/TkDesk/static/tk8.0/focus.tcl +lib/TkDesk/static/tk8.0/listbox.tcl +lib/TkDesk/static/tk8.0/menu.tcl +lib/TkDesk/static/tk8.0/msgbox.tcl +lib/TkDesk/static/tk8.0/obsolete.tcl +lib/TkDesk/static/tk8.0/optMenu.tcl +lib/TkDesk/static/tk8.0/palette.tcl +lib/TkDesk/static/tk8.0/prolog.ps +lib/TkDesk/static/tk8.0/safetk.tcl +lib/TkDesk/static/tk8.0/scale.tcl +lib/TkDesk/static/tk8.0/scrlbar.tcl +lib/TkDesk/static/tk8.0/tclIndex +lib/TkDesk/static/tk8.0/tearoff.tcl +lib/TkDesk/static/tk8.0/text.tcl +lib/TkDesk/static/tk8.0/tk.tcl +lib/TkDesk/static/tk8.0/tkfbox.tcl +lib/TkDesk/static/tk8.0/xmfbox.tcl lib/TkDesk/tclIndex -lib/TkDesk/tcl_lib/Version -lib/TkDesk/tcl_lib/init.tcl -lib/TkDesk/tcl_lib/ldAout.tcl -lib/TkDesk/tcl_lib/parray.tcl -lib/TkDesk/tcl_lib/tclIndex -lib/TkDesk/tk_lib/bgerror.tcl -lib/TkDesk/tk_lib/button.tcl -lib/TkDesk/tk_lib/clrpick.tcl -lib/TkDesk/tk_lib/comdlg.tcl -lib/TkDesk/tk_lib/console.tcl -lib/TkDesk/tk_lib/dialog.tcl -lib/TkDesk/tk_lib/entry.tcl -lib/TkDesk/tk_lib/focus.tcl -lib/TkDesk/tk_lib/folder.gif -lib/TkDesk/tk_lib/listbox.tcl -lib/TkDesk/tk_lib/menu.tcl -lib/TkDesk/tk_lib/msgbox.tcl -lib/TkDesk/tk_lib/obsolete.tcl -lib/TkDesk/tk_lib/optMenu.tcl -lib/TkDesk/tk_lib/palette.tcl -lib/TkDesk/tk_lib/prolog.ps -lib/TkDesk/tk_lib/scale.tcl -lib/TkDesk/tk_lib/scrlbar.tcl -lib/TkDesk/tk_lib/tclIndex -lib/TkDesk/tk_lib/tearoff.tcl -lib/TkDesk/tk_lib/text.tcl -lib/TkDesk/tk_lib/textfile.gif -lib/TkDesk/tk_lib/tk.tcl -lib/TkDesk/tk_lib/tkAppInit.c -lib/TkDesk/tk_lib/tkfbox.tcl -lib/TkDesk/tk_lib/updir.xbm -lib/TkDesk/tk_lib/xmfbox.tcl lib/TkDesk/tkpatches.tcl lib/TkDesk/update.tcl lib/TkDesk/util.tcl @@ -573,6 +581,8 @@ @dirrm lib/TkDesk/images/xbm @dirrm lib/TkDesk/images @dirrm lib/TkDesk/sounds -@dirrm lib/TkDesk/tcl_lib -@dirrm lib/TkDesk/tk_lib +@dirrm lib/TkDesk/static/itcl3.0 +@dirrm lib/TkDesk/static/tcl8.0 +@dirrm lib/TkDesk/static/tk8.0 +@dirrm lib/TkDesk/static @dirrm lib/TkDesk diff -ruN tkdesk/scripts/pre-patch tkdesk1.2/scripts/pre-patch --- tkdesk/scripts/pre-patch Wed Dec 31 16:00:00 1969 +++ tkdesk1.2/scripts/pre-patch Sun Apr 30 22:13:46 2000 @@ -0,0 +1,56 @@ +#!/bin/sh + +# +# This would all be unnecessary if the patches in 'tkdesk-1.2.fixes.tgz' +# were made relative to the same directory, any directory... +# + +cd ${WRKDIR} + +for file in *.diff +do + case "$file" in + 'appbar-dnd.diff') + [ -f ${file}.bak ] || cp -p $file ${file}.bak + sed \ + -e 's!^\*\*\* /usr/local/lib/TkDesk!\*\*\* tcldesk!' \ + -e 's!^\*\*\* tcldesk/appbar.tcl!&.orig!' \ + -e 's!^--- appbar.tcl!--- tcldesk/appbar.tcl!' \ + ${file}.bak >${file} && rm -f ${file}.bak + ;; + + 'exit-save-dd.diff') + [ -f ${file}.bak ] || cp -p $file ${file}.bak + sed \ + -e 's!^\*\*\* /usr/tmp/tkdesk-1.2/!\*\*\* !' \ + -e 's!^\*\*\* tkdesk.main!\*\*\* tkdesk.main.orig!' \ + ${file}.bak >${file} && rm -f ${file}.bak + ;; + + 'empty-trash.diff') + [ -f ${file}.bak ] || cp -p $file ${file}.bak + sed -e 's!^\*\*\* delete.tcl.orig!\*\*\* tcldesk/delete.tcl.orig!' \ + -e 's!^--- delete.tcl!--- tcldesk/delete.tcl!' \ + ${file}.bak >${file} && rm -f ${file}.bak + ;; + + 'find-dd.diff') + [ -f ${file}.bak ] || cp -p $file ${file}.bak + sed \ + -e 's!^\*\*\* /usr/tmp/tkdesk-1.2/!\*\*\* !' \ + -e 's!^\*\*\* tcldesk/find.tcl!&.orig!' \ + -e 's!^--- find.tcl!--- tcldesk/find.tcl!' \ + ${file}.bak >${file} && rm -f ${file}.bak + ;; + + '*.diff') + echo "Error - no patches found!" + exit 1;; + + *) + echo "Warning - unknown patch file '$file' encountered!" + echo "This probably means script file `basename $0` needs updating!" + exit 1 + ;; + esac +done >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?20000501220437.9F74E42A>