4 files changed, 52 insertions, 16 deletions

diff --git a/x11-fm/tkdesk/Makefile b/x11-fm/tkdesk/Makefile
index b022a582e5f4..900729cd23cf 100644
--- a/x11-fm/tkdesk/Makefile
+++ b/x11-fm/tkdesk/Makefile
@@ -6,25 +6,33 @@
 #
 
 PORTNAME=	tkdesk
-PORTVERSION=	2.0
-CATEGORIES=	x11-fm tk83
+PORTVERSION=	2.0.2
+CATEGORIES=	x11-fm tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}-${PORTVERSION:R}
+PATCHFILES=	${DISTNAME}p1.patch ${DISTNAME}p2.patch
+PATCH_SITES=	http://tkdesk.sourceforge.net/patches/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A graphical, highly configurable and powerful file manager
 
-LIB_DEPENDS=	itcl32:${PORTSDIR}/lang/itcl \
-		tk83.1:${PORTSDIR}/x11-toolkits/tk83
+LIB_DEPENDS=	BLT24:${PORTSDIR}/x11-toolkits/blt \
+		itcl:${PORTSDIR}/lang/itcl \
+		tk84:${PORTSDIR}/x11-toolkits/tk84
 
+PATCH_DIST_STRIP=-p1
 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
+MAKE_ENV+=	LIB_RUNTIME_DIR=${LOCABASE}/lib
+CONFIGURE_ENV=	CPPFLAG="-I${LOCALBASE}/include/itcl3.3" \
+		LDFLAGS="-L${LOCALBASE}/lib -litcl"
+CONFIGURE_ARGS=	--with-tcl=${LOCALBASE}/lib/tcl8.4 \
+		--with-tk=${LOCALBASE}/lib/tk8.4 \
+		  --with-blt=${LOCALBASE} \
+		--with-itcl=${LOCALBASE}/lib/itcl3.3
+EXTRACT_AFTER_ARGS=| ${TAR} -xf - --exclude blt
 
 MAN1=		tkdesk.1 cd-tkdesk.1 ed-tkdesk.1 od-tkdesk.1
 
@@ -33,7 +41,7 @@ post-patch:
 		's|<malloc\.h>|<stdlib.h>|g'
 
 pre-install:
-	@${FIND} ${WRKSRC}/tcldesk/configs -type f -name "*.orig" -delete
+	@${FIND} ${WRKSRC} -type f -name "*.orig" -delete
 
 post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/tkdesksh
diff --git a/x11-fm/tkdesk/distinfo b/x11-fm/tkdesk/distinfo
index a52ebcdf3b90..c8a1b751bcb4 100644
--- a/x11-fm/tkdesk/distinfo
+++ b/x11-fm/tkdesk/distinfo
@@ -1,3 +1,9 @@
 MD5 (tkdesk-2.0.tar.gz) = 8714575718465356167c50ae52d68131
 SHA256 (tkdesk-2.0.tar.gz) = a682cb4cd54a5d30844f55194d97899137a00843d6bef1b9a599d39ac3c8c324
 SIZE (tkdesk-2.0.tar.gz) = 907432
+MD5 (tkdesk-2.0p1.patch) = 932bf12a958037ef534660abb217dee1
+SHA256 (tkdesk-2.0p1.patch) = b1898f8c926eb36fb5248818b8db8f17e9410bbc16e8a0fa2a6dabadcddadc30
+SIZE (tkdesk-2.0p1.patch) = 3147
+MD5 (tkdesk-2.0p2.patch) = ad9865dfd51d13a9a61279a9c78ddc10
+SHA256 (tkdesk-2.0p2.patch) = e79428407def0229e47d8b20c941cceeb1cfbe5f8989d680a884836eb01f87ab
+SIZE (tkdesk-2.0p2.patch) = 138282
diff --git a/x11-fm/tkdesk/files/patch-aa b/x11-fm/tkdesk/files/patch-aa
index 67f47e3100b1..225e5c641da6 100644
--- a/x11-fm/tkdesk/files/patch-aa
+++ b/x11-fm/tkdesk/files/patch-aa
@@ -1,7 +1,23 @@
---- configure.orig	Wed Apr 14 12:39:47 2004
-+++ configure	Sat Apr 17 21:05:56 2004
-@@ -1592,8 +1592,9 @@
- # Determine include directories
+--- configure	Tue Apr 13 23:39:47 2004
++++ configure	Tue May 16 16:57:39 2006
+@@ -1568,12 +1568,12 @@
+ echo "${ECHO_T}./blt" >&6
+ else
+-   BLT_LIB_SPEC="-L$BLT_LIB_PATH -lBLT"
+-   BLT_LIB_STATIC=$BLT_LIB_PATH/libBLT.a
++   BLT_LIB_SPEC="-L$BLT_LIB_PATH -lBLT24"
++   BLT_LIB_STATIC=$BLT_LIB_PATH/libBLT24.a
+    NEED_BLT_LIB=
+    if test   ! -f $BLT_LIB_PATH/libBLT.a \
+           -a ! -f $BLT_LIB_PATH/libBLT.so
+    then
+-      if test   ! -f $BLT_LIB_PATH/lib/libBLT.a \
+-	     -a ! -f $BLT_LIB_PATH/lib/libBLT.so
++      if test   ! -f $BLT_LIB_PATH/lib/libBLT24.a \
++	     -a ! -f $BLT_LIB_PATH/lib/libBLT24.so
+       then
+ 	 echo
+@@ -1593,6 +1593,7 @@
  #
  
 -TCL_INCLUDE_PATH=$TCL_EXEC_PREFIX/include
@@ -11,4 +27,10 @@
 +
  
  #
- # Perform substitutions
+@@ -4509,5 +4510,5 @@
+ echo "${ECHO_T}$blt_cv_struct_wait_works" >&6
+ 
+-                                                  ac_config_files="$ac_config_files Makefile libdesk/Makefile blt/Makefile netscape-remote/Makefile tkdeskclient/Makefile"
++                                                  ac_config_files="$ac_config_files Makefile libdesk/Makefile netscape-remote/Makefile tkdeskclient/Makefile"
+ 
+ 
diff --git a/x11-fm/tkdesk/files/patch-ab b/x11-fm/tkdesk/files/patch-ab
index 6809cff0d744..6aeac8f499ad 100644
--- a/x11-fm/tkdesk/files/patch-ab
+++ b/x11-fm/tkdesk/files/patch-ab
@@ -14,7 +14,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); tclsh8.3 mkindex
++	cd $(SCRIPT_INSTALL_DIR); tclsh8.4 mkindex
  	@echo "=== Installing the manual pages..."
  	@for f in tkdesk.1 cd-tkdesk.1 ed-tkdesk.1 od-tkdesk.1; do \
  	    echo "installing $$f" ;\