Update to the new released version and revert to using tcl7.6/tk4.2

because this port will not work with anything newer at present.

PR:		5282
Reviewed by:	maintainer

4 files changed, 23 insertions, 110 deletions

diff --git a/x11-fm/tkdesk/Makefile b/x11-fm/tkdesk/Makefile
index 563192f7e24e..f40cfdadbaa7 100644
--- a/x11-fm/tkdesk/Makefile
+++ b/x11-fm/tkdesk/Makefile
@@ -1,25 +1,21 @@
 # New ports collection makefile for:	tkdesk
-# Version required:     1.0b5
+# Version required:     1.0
 # Date created:         30 Jul 1996
 # Whom:                 shanee@rabbit.augusta.de
 #
-# $Id: Makefile,v 1.4 1997/04/20 13:19:59 wosch Exp $
+# $Id: Makefile,v 1.5 1998/02/21 23:16:55 steve Exp $
 #
 
-DISTNAME=	tkdesk-1.0b5
-CATEGORIES=	misc x11 tk80
-MASTER_SITES=	http://people.mainz.netsurf.de/~bolik/tkdesk/ \
-		ftp://ftp.neosoft.com/pub/tcl/sorted/unknown/
+DISTNAME=	tkdesk-1.0
+CATEGORIES=	misc x11 tk42
+MASTER_SITES=	http://people.mainz.netsurf.de/~bolik/tkdesk/
 
 MAINTAINER=	dmlb@ragnet.demon.co.uk
 
-LIB_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11/tk80 \
-		tcl80\\.1\\.:${PORTSDIR}/lang/tcl80
+LIB_DEPENDS=	tk42\\.1\\.:${PORTSDIR}/x11/tk42
 
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
-CONFIGURE_ENV=	TCLCONF_PATH=${PREFIX}/lib/tcl8.0 TKCONF_PATH=${PREFIX}/lib/tk8.0
-CONFIGURE_ARGS=	--prefix=${PREFIX}
 
 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 25ab514b0ea1..cb828d4b69e1 100644
--- a/x11-fm/tkdesk/distinfo
+++ b/x11-fm/tkdesk/distinfo
@@ -1 +1 @@
-MD5 (tkdesk-1.0b5.tar.gz) = 9d846a3c38d18e5e0ddc1da21998c9cd
+MD5 (tkdesk-1.0.tar.gz) = 7fe5ed4242c5b2054cbd4438af697835
diff --git a/x11-fm/tkdesk/files/patch-aa b/x11-fm/tkdesk/files/patch-aa
index f31f69f0f2b6..e26b9e4dacd9 100644
--- a/x11-fm/tkdesk/files/patch-aa
+++ b/x11-fm/tkdesk/files/patch-aa
@@ -1,95 +1,13 @@
-*** Makefile.in.orig	Fri Dec  5 10:44:55 1997
---- Makefile.in	Wed Dec 10 21:52:59 1997
-***************
-*** 107,113 ****
-  # either.
-  #----------------------------------------------------------------
-  
-! CFLAGS =	${CC_OPTS} ${AC_FLAGS} -I. -I${TCLTK_INCLUDE_DIR} ${X_INCLUDE_FLAG}
-  LDFLAGS =	${LD_OPTS}
-  
-  PKGNAME =	tkdesk
---- 107,113 ----
-  # either.
-  #----------------------------------------------------------------
-  
-! CFLAGS =	${CC_OPTS} ${AC_FLAGS} -I. -I${TCLTK_INCLUDE_DIR}/tcl8.0 -I${TCLTK_INCLUDE_DIR}/tk8.0 ${X_INCLUDE_FLAG}
-  LDFLAGS =	${LD_OPTS}
-  
-  PKGNAME =	tkdesk
-*** blt/Makefile.in.orig	Wed Dec 10 21:55:46 1997
---- blt/Makefile.in	Wed Dec 10 21:54:34 1997
-***************
-*** 29,35 ****
-  # either.
-  #----------------------------------------------------------------
-  
-! CFLAGS =	${CC_OPTS} ${AC_FLAGS} -I.. -I. -I${TCLTK_INCLUDE_DIR} ${X_INCLUDE_FLAG}
-  BLT_LIBRARY =	$(LIB_DIR)
-  
-  libname	=	libBLT.a
---- 29,35 ----
-  # either.
-  #----------------------------------------------------------------
-  
-! CFLAGS =	${CC_OPTS} ${AC_FLAGS} -I.. -I. -I${TCLTK_INCLUDE_DIR}/tcl8.0 -I${TCLTK_INCLUDE_DIR}/tk8.0 ${X_INCLUDE_FLAG}
-  BLT_LIBRARY =	$(LIB_DIR)
-  
-  libname	=	libBLT.a
-*** itcl/Makefile.in.orig	Fri Dec  5 10:44:56 1997
---- itcl/Makefile.in	Wed Dec 10 21:57:21 1997
-***************
-*** 26,32 ****
-  # either.
-  #----------------------------------------------------------------
-  
-! CFLAGS =	${CC_OPTS} ${AC_FLAGS} -I.. -I${TCLTK_INCLUDE_DIR}
-  
-  libname	=	libitcl.a
-  
---- 26,32 ----
-  # either.
-  #----------------------------------------------------------------
-  
-! CFLAGS =	${CC_OPTS} ${AC_FLAGS} -I.. -I${TCLTK_INCLUDE_DIR}/tcl8.0 -I${TCLTK_INCLUDE_DIR}/tk8.0
-  
-  libname	=	libitcl.a
-  
-*** libdesk/Makefile.in.orig	Fri Dec  5 10:44:56 1997
---- libdesk/Makefile.in	Wed Dec 10 21:58:10 1997
-***************
-*** 29,35 ****
-  # either.
-  #----------------------------------------------------------------
-  
-! CFLAGS =	${CC_OPTS} ${AC_FLAGS} -I.. -I${TCLTK_INCLUDE_DIR} ${X_INCLUDE_FLAG}
-  
-  libname	=	libdesk.a
-  
---- 29,35 ----
-  # either.
-  #----------------------------------------------------------------
-  
-! CFLAGS =	${CC_OPTS} ${AC_FLAGS} -I.. -I${TCLTK_INCLUDE_DIR}/tcl8.0 -I${TCLTK_INCLUDE_DIR}/tk8.0 ${X_INCLUDE_FLAG}
-  
-  libname	=	libdesk.a
-  
-*** netscape-remote/Makefile.in.orig	Fri Dec  5 10:44:56 1997
---- netscape-remote/Makefile.in	Wed Dec 10 22:00:37 1997
-***************
-*** 29,35 ****
-  # either.
-  #----------------------------------------------------------------
-  
-! CFLAGS =	${CC_OPTS} ${AC_FLAGS} -I.. -I${TCLTK_INCLUDE_DIR} ${X_INCLUDE_FLAG}
-  
-  libname	=	libnetscape.a
-  
---- 29,35 ----
-  # either.
-  #----------------------------------------------------------------
-  
-! CFLAGS =	${CC_OPTS} ${AC_FLAGS} -I.. -I${TCLTK_INCLUDE_DIR}/tcl8.0 -I${TCLTK_INCLUDE_DIR}/tk8.0 ${X_INCLUDE_FLAG}
-  
-  libname	=	libnetscape.a
-  
+--- configure.orig	Fri Feb 27 11:33:27 1998
++++ configure	Fri Feb 27 11:33:54 1998
+@@ -2109,8 +2109,8 @@
+ s%@TCL_LD_SEARCH_FLAGS@%$TCL_LD_SEARCH_FLAGS%g
+ s%@TCL_EXEC_PREFIX@%$TCL_EXEC_PREFIX%g
+ s%@TK_EXEC_PREFIX@%$TK_EXEC_PREFIX%g
+-s%@TCL_INCLUDE_PATH@%$TCL_INCLUDE_PATH%g
+-s%@TK_INCLUDE_PATH@%$TK_INCLUDE_PATH%g
++s%@TCL_INCLUDE_PATH@%$TCL_INCLUDE_PATH/tcl7.6%g
++s%@TK_INCLUDE_PATH@%$TK_INCLUDE_PATH/tk4.2%g
+ s%@TK_XINCLUDES@%$TK_XINCLUDES%g
+ s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
+ s%@TK_LIB_SPEC@%$TK_LIB_SPEC%g
diff --git a/x11-fm/tkdesk/pkg-plist b/x11-fm/tkdesk/pkg-plist
index eef1d080ede5..2623f6fe244c 100644
--- a/x11-fm/tkdesk/pkg-plist
+++ b/x11-fm/tkdesk/pkg-plist
@@ -1,7 +1,9 @@
 bin/cd-tkdesk
 bin/ed-tkdesk
 bin/od-tkdesk
+bin/op-tkdesk
 bin/pauseme
+bin/pop-tkdesk
 bin/tkdesk
 bin/tkdeskclient
 bin/tkdesksh
@@ -55,10 +57,7 @@ lib/TkDesk/clrpick.tcl
 lib/TkDesk/config.tcl
 lib/TkDesk/configs/AppBar
 lib/TkDesk/configs/AppBar_Be
-lib/TkDesk/configs/AppBar_Be~
 lib/TkDesk/configs/AppBar_Games
-lib/TkDesk/configs/AppBar_Games~
-lib/TkDesk/configs/AppBar~
 lib/TkDesk/configs/ButtonBar
 lib/TkDesk/configs/Commands
 lib/TkDesk/configs/Directories
@@ -196,6 +195,7 @@ lib/TkDesk/images/ficons16/mini-comet.xpm
 lib/TkDesk/images/ficons16/music.xpm
 lib/TkDesk/images/ficons16/parcel.xpm
 lib/TkDesk/images/ficons16/prism.xpm
+lib/TkDesk/images/ficons16/rpm.xpm
 lib/TkDesk/images/ficons16/script.xpm
 lib/TkDesk/images/ficons16/sound.xpm
 lib/TkDesk/images/ficons16/speaker.xpm
@@ -521,7 +521,6 @@ lib/TkDesk/sounds/robot_dead.au
 lib/TkDesk/sounds/start.au
 lib/TkDesk/tclIndex
 lib/TkDesk/tcl_lib/Version
-lib/TkDesk/tcl_lib/Version~
 lib/TkDesk/tcl_lib/init.tcl
 lib/TkDesk/tcl_lib/ldAout.tcl
 lib/TkDesk/tcl_lib/parray.tcl