- Update to version 2.0

PR:		ports/65720
Submitted by:	Ports Fury

12 files changed, 71 insertions, 307 deletions

diff --git a/x11-fm/tkdesk/Makefile b/x11-fm/tkdesk/Makefile
index 0f5cd904b222..fe6e7bb83d90 100644
--- a/x11-fm/tkdesk/Makefile
+++ b/x11-fm/tkdesk/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	tkdesk
-PORTVERSION=	1.2
-PORTREVISION=	2
+PORTVERSION=	2.0
 CATEGORIES=	x11-fm tk83
-MASTER_SITES=	http://tkdesk.sourceforge.net/dist/ \
-		${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	X11/desktop
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A graphical, highly configurable and powerful file manager
@@ -19,19 +17,28 @@ COMMENT=	A graphical, highly configurable and powerful file manager
 LIB_DEPENDS=	itcl32:${PORTSDIR}/lang/itcl \
 		tk83.1:${PORTSDIR}/x11-toolkits/tk83
 
-USE_GMAKE=	YES
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=--with-tcl=${LOCALBASE}/lib/tcl8.3
-CONFIGURE_ARGS+=--with-tk=${LOCALBASE}/lib/tk8.3
-CONFIGURE_ARGS+=--with-itcl=${LOCALBASE}/lib/itcl3.2
+USE_REINPLACE=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAG="-I${LOCALBASE}/include/itcl3.2" \
+		LDFLAGS="-L${LOCALBASE}/lib -litcl32"
+CONFIGURE_ARGS=	--with-tcl=${LOCALBASE}/lib/tcl8.3 \
+		--with-tk=${LOCALBASE}/lib/tk8.3 \
+		--with-itcl=${LOCALBASE}/lib/itcl3.2
 
 MAN1=		tkdesk.1 cd-tkdesk.1 ed-tkdesk.1 od-tkdesk.1
 
+post-patch:
+	@${GREP} -lR "<malloc\.h>" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
+		's|<malloc\.h>|<stdlib.h>|g'
+
 pre-install:
-	@${FIND} ${WRKSRC} -type f -name '*.orig' -exec ${RM} -f {} ';'
+	@${FIND} ${WRKSRC}/tcldesk/configs -type f -name "*.orig" -delete
 
 post-install:
-	${STRIP_CMD} ${PREFIX}/bin/tkdesksh
-	${STRIP_CMD} ${PREFIX}/bin/tkdeskclient
+	@${STRIP_CMD} ${PREFIX}/bin/tkdesksh
+	@${STRIP_CMD} ${PREFIX}/bin/tkdeskclient
+	@${MKDIR} -m 755 ${PREFIX}/lib/TkDesk/configs/.trash
 
 .include <bsd.port.mk>
diff --git a/x11-fm/tkdesk/distinfo b/x11-fm/tkdesk/distinfo
index f421924f4eeb..eaf07d847a06 100644
--- a/x11-fm/tkdesk/distinfo
+++ b/x11-fm/tkdesk/distinfo
@@ -1,2 +1,2 @@
-MD5 (tkdesk-1.2.tar.gz) = 33aa10a3d3b51017cdd495886848a2a6
-SIZE (tkdesk-1.2.tar.gz) = 1079153
+MD5 (tkdesk-2.0.tar.gz) = 8714575718465356167c50ae52d68131
+SIZE (tkdesk-2.0.tar.gz) = 907432
diff --git a/x11-fm/tkdesk/files/patch-aa b/x11-fm/tkdesk/files/patch-aa
index 4985bfcec825..67f47e3100b1 100644
--- a/x11-fm/tkdesk/files/patch-aa
+++ b/x11-fm/tkdesk/files/patch-aa
@@ -1,58 +1,14 @@
---- configure.orig      Sun Nov 14 16:07:45 1999
-+++ configure   Sun Sep  2 22:02:05 2001
-@@ -653,7 +653,7 @@
- echo $ac_n "checking version of Tcl/Tk""... $ac_c" 1>&6
- echo "configure:655: checking version of Tcl/Tk" >&5
- echo "$ac_t""$TCL_VERSION/$TK_VERSION" 1>&6
--TCL_VERSIONS_ALLOWED="7.5 7.6 8.0 8.1 8.2"
-+TCL_VERSIONS_ALLOWED="7.5 7.6 8.0 8.1 8.2 8.3"
- if test -z "`echo $TCL_VERSIONS_ALLOWED | grep $TCL_VERSION`"; then
-   echo
-   echo TkDesk requires Tcl/Tk versions 7.5/4.1, 7.6/4.2., or 8.0.
-@@ -661,7 +661,7 @@
-   echo yet supported \(but hopefully will be soon\).
-   exit 1
- fi
--TK_VERSIONS_ALLOWED="4.1 4.2 8.0 8.1 8.2"
-+TK_VERSIONS_ALLOWED="4.1 4.2 8.0 8.1 8.2 8.3"
- if test -z "`echo $TK_VERSIONS_ALLOWED | grep $TK_VERSION`"; then
-   echo
-   echo TkDesk requires Tcl/Tk versions 7.5/4.1, 7.6/4.2, or 8.0.
-@@ -678,11 +678,9 @@
- if test "$TCL_MAJOR_VERSION" -ge 8; then
-   echo $ac_n "checking for itcl 3.x""... $ac_c" 1>&6
- echo "configure:681: checking for itcl 3.x" >&5
--  if test -z "$ITCLCONF_PATH" ; then
--    ITCLCONF_PATH=$TCLCONF_PATH
--  fi
--  if test -r $ITCLCONF_PATH/itclConfig.sh ; then
--    . $ITCLCONF_PATH/itclConfig.sh
-+  if test -r $ITCLCONF_PATH/itcl.tcl ; then
-+    ITCL_VERSION="32"
-+    ITCL_MAJOR_VERSION=3
-   else
-     ITCL_VERSION="no"
-     ITCL_MAJOR_VERSION=0
-@@ -739,14 +737,15 @@
+--- configure.orig	Wed Apr 14 12:39:47 2004
++++ configure	Sat Apr 17 21:05:56 2004
+@@ -1592,8 +1592,9 @@
+ # Determine include directories
  #
- # -----------------------------------------------------------------------
- if test "$ITCL_VERSION" != "no" ; then
--  TCL_INCLUDE_PATH=$TCL_EXEC_PREFIX/include
--  TK_INCLUDE_PATH=$TCL_INCLUDE_PATH
--  NEED_ITCL_LIB=
-+  TCL_INCLUDE_PATH=$TCL_EXEC_PREFIX/include/tcl${TCL_VERSION}
-+  TK_INCLUDE_PATH=$TK_EXEC_PREFIX/include/tk${TK_VERSION}
-+  NEED_ITCL_LIB=lib_itcl
-   # ITCL_LIB_SPEC already set in itclConfig.sh
--  ITCL_LIB_STATIC=${TCLCONF_PATH}/libitcl${ITCL_VERSION}.a
-+  ITCL_LIB_SPEC="-L${PREFIX}/lib -litcl${ITCL_VERSION}"
-+  ITCL_LIB_STATIC=${PREFIX}/libitcl${ITCL_VERSION}.a
- else
--  TCL_INCLUDE_PATH=$TCL_EXEC_PREFIX/include
--  TK_INCLUDE_PATH=$TK_EXEC_PREFIX/include
-+  TCL_INCLUDE_PATH=$TCL_EXEC_PREFIX/include/tcl${TCL_VERSION}
-+  TK_INCLUDE_PATH=$TK_EXEC_PREFIX/include/tk${TK_VERSION}
-   NEED_ITCL_LIB=lib_itcl
-   ITCL_LIB_SPEC=itcl/libitcl.a
-   ITCL_LIB_STATIC=itcl/libitcl.a
-
+ 
+-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}
++
+ 
+ #
+ # Perform substitutions
diff --git a/x11-fm/tkdesk/files/patch-ab b/x11-fm/tkdesk/files/patch-ab
index 5fcc7bb72f11..6809cff0d744 100644
--- a/x11-fm/tkdesk/files/patch-ab
+++ b/x11-fm/tkdesk/files/patch-ab
@@ -1,6 +1,15 @@
---- Makefile.in~	Sun Sep 20 20:41:40 1998
-+++ Makefile.in	Sun Sep  2 23:03:53 2001
-@@ -194,7 +194,7 @@
+--- Makefile.in.orig	Thu Apr 15 07:31:17 2004
++++ Makefile.in	Sat Apr 17 21:52:56 2004
+@@ -50,7 +50,7 @@
+ 
+ # To change the compiler switches, for example to change from -O
+ # to -g, change the following line:
+-CC_OPTS = -O -DUSE_OLD_IMAGE -DUSE_NON_CONST
++CC_OPTS = @CFLAGS@ -DUSE_OLD_IMAGE -DUSE_NON_CONST
+ 
+ # To change the linker switches, for example to add -s,
+ # change the following line:
+@@ -189,7 +189,7 @@
  	find $(SCRIPT_INSTALL_DIR) -type f -exec chmod a+r {} \;
  	find $(SCRIPT_INSTALL_DIR) -type d -exec chmod a+rx {} \;
  	@echo "=== Creating index..."
diff --git a/x11-fm/tkdesk/files/patch-ac b/x11-fm/tkdesk/files/patch-ac
index ffc8734778f5..27990e62385d 100644
--- a/x11-fm/tkdesk/files/patch-ac
+++ b/x11-fm/tkdesk/files/patch-ac
@@ -1,15 +1,6 @@
---- tcldesk/configs/AppBar.orig	Sun Nov 14 14:07:53 1999
-+++ tcldesk/configs/AppBar	Sun Sep  2 23:09:23 2001
-@@ -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://tkdesk.sourceforge.net/ window}}
-     	-
-     	{{Manual Page ...} {
-     		dsk_read_string {Show manual page for: (e.g. col(1))} {
-@@ -392,7 +392,7 @@
+--- tcldesk/configs/AppBar.orig	Tue Apr 13 15:41:00 2004
++++ tcldesk/configs/AppBar	Sat Apr 17 21:54:11 2004
+@@ -405,7 +405,7 @@
      	    }
  	}
  	{{Superuser}
@@ -18,12 +9,3 @@
  	    {{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://tkdesk.sourceforge.net/ 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
deleted file mode 100644
index e607aa29d564..000000000000
--- a/x11-fm/tkdesk/files/patch-ad
+++ /dev/null
@@ -1,20 +0,0 @@
---- tcldesk/configs/AppBar_Be.orig	Sun Nov 14 14:07:53 1999
-+++ tcldesk/configs/AppBar_Be	Sun Sep  2 23:10:14 2001
-@@ -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://tkdesk.sourceforge.net/ 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://tkdesk.sourceforge.net/ 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-af b/x11-fm/tkdesk/files/patch-af
deleted file mode 100644
index 3a97c00b0a31..000000000000
--- a/x11-fm/tkdesk/files/patch-af
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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
deleted file mode 100644
index 93824307eec4..000000000000
--- a/x11-fm/tkdesk/files/patch-ag
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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
deleted file mode 100644
index 5e29282a4cc4..000000000000
--- a/x11-fm/tkdesk/files/patch-ah
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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
deleted file mode 100644
index 84df1abdce5e..000000000000
--- a/x11-fm/tkdesk/files/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/patch-aj b/x11-fm/tkdesk/files/patch-aj
deleted file mode 100644
index a7571388cadb..000000000000
--- a/x11-fm/tkdesk/files/patch-aj
+++ /dev/null
@@ -1,63 +0,0 @@
---- libdesk/tixImgXpm.c.orig	Sun Nov 14 16:07:47 1999
-+++ libdesk/tixImgXpm.c	Sun Sep  2 22:41:43 2001
-@@ -156,7 +156,7 @@
-  */
- 
- static int		ImgXpmCreate _ANSI_ARGS_((Tcl_Interp *interp,
--			    char *name, int argc, char **argv,
-+			    char *name, int objc, Tcl_Obj *CONST objv[],
- 			    Tk_ImageType *typePtr, Tk_ImageMaster master,
- 			    ClientData *clientDataPtr));
- static ClientData	ImgXpmGet _ANSI_ARGS_((Tk_Window tkwin,
-@@ -176,7 +176,7 @@
-     ImgXpmDisplay,		/* displayProc */
-     ImgXpmFree,			/* freeProc */
-     ImgXpmDelete,		/* deleteProc */
--    (Tk_ImageType *) NULL	/* nextPtr */
-+    /*	(Tk_ImageType *) NULL	*//* nextPtr */
- };
- 
- /*
-@@ -241,12 +241,12 @@
-  *----------------------------------------------------------------------
-  */
- static int
--ImgXpmCreate(interp, name, argc, argv, typePtr, master, clientDataPtr)
-+ImgXpmCreate(interp, name, objc, objv, typePtr, master, clientDataPtr)
-     Tcl_Interp *interp;		/* Interpreter for application containing
- 				 * image. */
-     char *name;			/* Name to use for image. */
--    int argc;			/* Number of arguments. */
--    char **argv;		/* Argument strings for options (doesn't
-+    int objc;			/* Number of arguments. */
-+    Tcl_Obj *CONST objv[];		/* Argument strings for options (doesn't
- 				 * include image name or type). */
-     Tk_ImageType *typePtr;	/* Pointer to our type record (not used). */
-     Tk_ImageMaster master;	/* Token for image, to be used by us in
-@@ -256,6 +256,13 @@
- {
-     PixmapMaster *masterPtr;
- 
-+    int i;
-+    char **argv = (char **) Tcl_Alloc(objc * sizeof(char*));
-+    for (i=0; i < objc; i++) {
-+
-+      argv[i] = Tcl_GetString(objv[i]);
-+    }
-+
-     masterPtr = (PixmapMaster *) ckalloc(sizeof(PixmapMaster));
-     masterPtr->tkMaster = master;
-     masterPtr->interp = interp;
-@@ -269,10 +276,11 @@
-     masterPtr->isDataAlloced = 0;
-     masterPtr->instancePtr = NULL;
- 
--    if (ImgXpmConfigureMaster(masterPtr, argc, argv, 0) != TCL_OK) {
-+    if (ImgXpmConfigureMaster(masterPtr, objc, argv, 0) != TCL_OK) {
- 	ImgXpmDelete((ClientData) masterPtr);
- 	return TCL_ERROR;
-     }
-+    Tcl_Free((char *) argv);
-     *clientDataPtr = (ClientData) masterPtr;
-     return TCL_OK;
- }
diff --git a/x11-fm/tkdesk/pkg-plist b/x11-fm/tkdesk/pkg-plist
index 673d65adef5e..ad32d9d6b8d6 100644
--- a/x11-fm/tkdesk/pkg-plist
+++ b/x11-fm/tkdesk/pkg-plist
@@ -27,9 +27,9 @@ lib/TkDesk/appbar-load.tcl
 lib/TkDesk/appbar-mail.tcl
 lib/TkDesk/appbar-trash.tcl
 lib/TkDesk/appbar.tcl
-lib/TkDesk/bookmarks.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
 lib/TkDesk/cb_tools/bitmaps/down.xbm
@@ -57,7 +57,6 @@ lib/TkDesk/cb_tools/popup.tcl
 lib/TkDesk/cb_tools/tclIndex
 lib/TkDesk/cb_tools/tools.tcl
 lib/TkDesk/cb_tools/widgets.tcl
-lib/TkDesk/clrpick.tcl
 lib/TkDesk/config.tcl
 lib/TkDesk/configs/AppBar
 lib/TkDesk/configs/AppBar_Be
@@ -75,12 +74,13 @@ lib/TkDesk/copy.tcl
 lib/TkDesk/cpanels.tcl
 lib/TkDesk/delete.tcl
 lib/TkDesk/diary.tcl
-lib/TkDesk/envedit.tcl
-lib/TkDesk/doc/CHANGES
+lib/TkDesk/doc/ChangeLog
 lib/TkDesk/doc/Guide
 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
@@ -89,10 +89,9 @@ lib/TkDesk/doc/guide-6.html
 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
@@ -169,6 +168,7 @@ lib/TkDesk/images/construction.xpm
 lib/TkDesk/images/copy.xpm
 lib/TkDesk/images/copy2.xpm
 lib/TkDesk/images/desk.xpm
+lib/TkDesk/images/desk2.xpm
 lib/TkDesk/images/document.xpm
 lib/TkDesk/images/door_run.xpm
 lib/TkDesk/images/earth.xpm
@@ -269,6 +269,8 @@ lib/TkDesk/images/mail_edit.xpm
 lib/TkDesk/images/mailbox_empty.xpm
 lib/TkDesk/images/mailbox_full.xpm
 lib/TkDesk/images/mailbox_old.xpm
+lib/TkDesk/images/maildog_empty.xpm
+lib/TkDesk/images/maildog_new.xpm
 lib/TkDesk/images/man.xpm
 lib/TkDesk/images/moon.xpm
 lib/TkDesk/images/mosaic.xpm
@@ -404,6 +406,7 @@ lib/TkDesk/images/next/wrench.xpm
 lib/TkDesk/images/orbit.xpm
 lib/TkDesk/images/pacman.xpm
 lib/TkDesk/images/paint.xpm
+lib/TkDesk/images/pda.xpm
 lib/TkDesk/images/pen.xpm
 lib/TkDesk/images/pencil3.xpm
 lib/TkDesk/images/printer.xpm
@@ -416,10 +419,12 @@ lib/TkDesk/images/shell.xpm
 lib/TkDesk/images/stars.xpm
 lib/TkDesk/images/terminal.xpm
 lib/TkDesk/images/tetris.xpm
+lib/TkDesk/images/tkdesk_logo.ppm
 lib/TkDesk/images/tools.xpm
 lib/TkDesk/images/trash.xpm
 lib/TkDesk/images/trashcan.xpm
 lib/TkDesk/images/trashcan_full.xpm
+lib/TkDesk/images/twotexts.xpm
 lib/TkDesk/images/up.xpm
 lib/TkDesk/images/xbm/apple_draft.xbm
 lib/TkDesk/images/xbm/apple_write.xbm
@@ -531,58 +536,19 @@ lib/TkDesk/sounds/metal.au
 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/tkpatches.tcl
 lib/TkDesk/update.tcl
 lib/TkDesk/util.tcl
-@dirrm lib/TkDesk/cb_tools/bitmaps
-@dirrm lib/TkDesk/cb_tools
-@dirrm lib/TkDesk/configs/.trash
-@dirrm lib/TkDesk/configs
-@dirrm lib/TkDesk/doc
-@dirrm lib/TkDesk/images/be
-@dirrm lib/TkDesk/images/ficons16
-@dirrm lib/TkDesk/images/ficons32
-@dirrm lib/TkDesk/images/next
+@dirrm lib/TkDesk/sounds
 @dirrm lib/TkDesk/images/xbm
+@dirrm lib/TkDesk/images/next
+@dirrm lib/TkDesk/images/ficons32
+@dirrm lib/TkDesk/images/ficons16
+@dirrm lib/TkDesk/images/be
 @dirrm lib/TkDesk/images
-@dirrm lib/TkDesk/sounds
-@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/doc
+@dirrm lib/TkDesk/configs/.trash
+@dirrm lib/TkDesk/configs
+@dirrm lib/TkDesk/cb_tools/bitmaps
+@dirrm lib/TkDesk/cb_tools
 @dirrm lib/TkDesk