Upgrade to tkdesk-1.2

This supports tcl/tk 8.2

5 files changed, 70 insertions, 47 deletions

diff --git a/x11-fm/tkdesk/Makefile b/x11-fm/tkdesk/Makefile
index 03ecba63c030..bb6e4a508c12 100644
--- a/x11-fm/tkdesk/Makefile
+++ b/x11-fm/tkdesk/Makefile
@@ -6,18 +6,23 @@
 #
 
 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/ \
+		${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR= X11/desktop
 
 MAINTAINER=	dmlb@ragnet.demon.co.uk
 
-LIB_DEPENDS=	tk42.1:${PORTSDIR}/x11-toolkits/tk42
+LIB_DEPENDS=	itk30.1:${PORTSDIR}/x11-toolkits/itk \
+		BLT24.2:${PORTSDIR}/x11-toolkits/blt
 
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
-CONFIGURE_ENV+=	TCLCONF_PATH=${LOCALBASE}/lib/tcl7.6
-CONFIGURE_ENV+=	TKCONF_PATH=${LOCALBASE}/lib/tk4.2
+CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}/lib/tcl8.2
+CONFIGURE_ARGS+= --with-tk=${LOCALBASE}/lib/tk8.2
+CONFIGURE_ARGS+= --with-itcl=${LOCALBASE}/lib/itcl3.0
+CONFIGURE_ARGS+= --with-blt=${LOCALBASE}/lib
 
 MAN1=		tkdesk.1 cd-tkdesk.1 ed-tkdesk.1 od-tkdesk.1
 
diff --git a/x11-fm/tkdesk/distinfo b/x11-fm/tkdesk/distinfo
index 6640e356d38c..a39b7eee1e44 100644
--- a/x11-fm/tkdesk/distinfo
+++ b/x11-fm/tkdesk/distinfo
@@ -1 +1 @@
-MD5 (tkdesk-1.1.tar.gz) = 4ac95c572a662709f7f575ad3544afc3
+MD5 (tkdesk-1.2.tar.gz) = 33aa10a3d3b51017cdd495886848a2a6
diff --git a/x11-fm/tkdesk/files/patch-aa b/x11-fm/tkdesk/files/patch-aa
index 8c0334d6e3a4..b502df6c8cb9 100644
--- a/x11-fm/tkdesk/files/patch-aa
+++ b/x11-fm/tkdesk/files/patch-aa
@@ -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 17:07:45 1999
++++ configure	Mon May  1 13:40:36 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 --git a/x11-fm/tkdesk/files/patch-ab b/x11-fm/tkdesk/files/patch-ab
index 45db0b27f542..6e7598bedef7 100644
--- a/x11-fm/tkdesk/files/patch-ab
+++ b/x11-fm/tkdesk/files/patch-ab
@@ -5,7 +5,7 @@
  	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 --git a/x11-fm/tkdesk/pkg-plist b/x11-fm/tkdesk/pkg-plist
index 002837205c27..673d65adef5e 100644
--- a/x11-fm/tkdesk/pkg-plist
+++ b/x11-fm/tkdesk/pkg-plist
@@ -13,9 +13,11 @@ lib/TkDesk/DiskUsage.tcl
 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
@@ -26,6 +28,8 @@ 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/cb_tools/bindings.tcl
 lib/TkDesk/cb_tools/bitmaps/combo.xbm
 lib/TkDesk/cb_tools/bitmaps/down.xbm
@@ -69,10 +73,9 @@ lib/TkDesk/configs/System
 @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/envedit.tcl
 lib/TkDesk/doc/CHANGES
 lib/TkDesk/doc/Guide
 lib/TkDesk/doc/License
@@ -192,10 +195,12 @@ lib/TkDesk/images/ficons16/gif.xpm
 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/World.xpm
 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/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/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 @@ lib/TkDesk/util.tcl
 @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