Update fkdesk to 2.0p2, apply upstream patches, with fixes build with TCL 8.6,

Itcl 4.0.0 is bundled.
XXX: but not works well yet.

2.0p1  04/16/2004
Compilation of the file libdesk/tixImgXpm.c fails when using a Tk version lower than 8.3.

2.0p2  04/20/2004
Some Linux distributions are using newer "unofficial" versions of Incr Tcl
(Itcl). Though TkDesk 2.0 works with the official Itcl 3.2.1 release, these
newer Itcl installations disable backwards compatibility for some older Itcl
syntax that TkDesk still requires. The typical symptom of this problem is this
error message when TkDesk is started:
Error in startup script: can't rename "itcl_class": command doesn't exist...

4 files changed, 40 insertions, 30 deletions

diff --git a/sysutils/tkdesk/Makefile b/sysutils/tkdesk/Makefile
index c4f241d3f9e..30036b665ed 100644
--- a/sysutils/tkdesk/Makefile
+++ b/sysutils/tkdesk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2014/01/11 14:42:05 adam Exp $
+# $NetBSD: Makefile,v 1.26 2014/02/22 07:53:47 obache Exp $
 #
 
 DISTNAME=	tkdesk-2.0
-PKGREVISION=	7
+PKGNAME=	${DISTNAME}p2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://tkdesk.sourceforge.net/dist/
 
@@ -10,27 +10,31 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://tkdesk.sourceforge.net/
 COMMENT=	Graphical file manager
 
+PATCHFILES=	${DISTNAME}p1.patch ${DISTNAME}p2.patch
+PATCH_DIST_STRIP=	-p1
+PATCH_SITES=	http://tkdesk.sourceforge.net/patches/
+
 USE_TOOLS+=	pax
 
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=--with-tcl=${BUILDLINK_PREFIX.tcl}/lib	\
 		--with-tk=${BUILDLINK_PREFIX.tk}/lib	\
-		--with-itcl=${BUILDLINK_PREFIX.tcl-itcl}/lib	\
+		--with-itcl=${BUILDLINK_PREFIX.tcl}/lib/itcl4.0.0	\
 		--with-blt=${BUILDLINK_PREFIX.blt}/lib
-MAKE_ENV+=	LIB_RUNTIME_DIR=${BUILDLINK_PREFIX.tcl-itcl:Q}/lib \
-		PAX=${PAX:Q}
+MAKE_ENV+=	LIB_RUNTIME_DIR=${BUILDLINK_PREFIX.tcl}/lib/itcl4.0.0
+
+CFLAGS+=	-DUSE_INTERP_RESULT
 
-INSTALL_MAKE_FLAGS+=	INSTALL_ROOT=${DESTDIR}
+DESTDIR_VARNAME=	INSTALL_ROOT
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 
 .include "../../lang/tcl/buildlink3.mk"
-.include "../../lang/tcl-itcl/buildlink3.mk"
 .include "../../x11/blt/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
 
 pre-install:
 	${RM} -Rf ${WRKSRC}/tcldesk/configs/.trash
-	${FIND} ${WRKSRC}/tcldesk -type f -name '*.orig' -print | ${XARGS} ${RM} -rf
+	${FIND} ${WRKSRC}/tcldesk -type f \( -name '*.orig' -or -name '*.orig_dist' \) -print | ${XARGS} ${RM} -rf
 	${FIND} ${WRKSRC}/tcldesk -type f -print | ${XARGS} ${TOUCH}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/tkdesk/distinfo b/sysutils/tkdesk/distinfo
index 825adf3d29f..0a47d8020d7 100644
--- a/sysutils/tkdesk/distinfo
+++ b/sysutils/tkdesk/distinfo
@@ -1,12 +1,18 @@
-$NetBSD: distinfo,v 1.7 2006/10/14 02:18:37 rillig Exp $
+$NetBSD: distinfo,v 1.8 2014/02/22 07:53:47 obache Exp $
 
 SHA1 (tkdesk-2.0.tar.gz) = 6ee7e290c094a957b92647fa83e23b0765556bf7
 RMD160 (tkdesk-2.0.tar.gz) = bd3983465e44aa0c294d1936fc5f3f450535d9c2
 Size (tkdesk-2.0.tar.gz) = 907432 bytes
+SHA1 (tkdesk-2.0p1.patch) = 70f8e70c496482a0a3b90dbd57e500a3ab95bfa9
+RMD160 (tkdesk-2.0p1.patch) = e0aa4f45ee9d4f8fa4edc4fb16b9bf3dd80961be
+Size (tkdesk-2.0p1.patch) = 3147 bytes
+SHA1 (tkdesk-2.0p2.patch) = 0bce0989a8c6303367ae50501cb3254a68cea418
+RMD160 (tkdesk-2.0p2.patch) = 1ac650af51732ccb8ef697e3cfbc45980d530435
+Size (tkdesk-2.0p2.patch) = 138282 bytes
 SHA1 (patch-aa) = d244a1e004247081b049156457d66c1952668a13
-SHA1 (patch-ab) = 0250bf748da921d25b2c0e96841f3fbed42fd96e
+SHA1 (patch-ab) = 50e591e0732abf19bec531ba1667cadc6c4b24cf
 SHA1 (patch-ac) = 286a2bb4177431f87b778ed943cd57961aeb48ab
 SHA1 (patch-ae) = c09cd944af50c2a31020a7478c1568e847b0cb02
-SHA1 (patch-aj) = 5ad17e6634f626e56f83c51a6ca9ee66b21aee16
+SHA1 (patch-aj) = 42f4f44c8b5aff02bb409198fe96d42f987a165c
 SHA1 (patch-ak) = 441a1eefd5872786981b25aa07482a8d6d9515aa
 SHA1 (patch-al) = 70a7a20f9e983ef1b31675631c5a7dd26e03b026
diff --git a/sysutils/tkdesk/patches/patch-ab b/sysutils/tkdesk/patches/patch-ab
index 0f339d2e7bf..ba451d9b171 100644
--- a/sysutils/tkdesk/patches/patch-ab
+++ b/sysutils/tkdesk/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2005/10/26 04:29:01 minskim Exp $
+$NetBSD: patch-ab,v 1.3 2014/02/22 07:53:47 obache Exp $
 
---- Makefile.in.orig	2004-04-14 17:31:17.000000000 -0500
+--- Makefile.in.orig	2004-04-14 22:31:17.000000000 +0000
 +++ Makefile.in
 @@ -28,7 +28,7 @@ exec_prefix =	@exec_prefix@
  INSTALL_ROOT =
@@ -11,6 +11,15 @@ $NetBSD: patch-ab,v 1.2 2005/10/26 04:29:01 minskim Exp $
  
  # Path name to use when installing library scripts:
  SCRIPT_INSTALL_DIR =	$(INSTALL_ROOT)$(TKDESK_LIBRARY)
+@@ -50,7 +50,7 @@ MAN1_INSTALL_DIR =	$(MAN_INSTALL_DIR)/ma
+ 
+ # 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:
 @@ -173,28 +173,29 @@ tkdesk_script:
  rm_tkdesk_script:
  	@rm -f tkdesk
@@ -34,7 +43,7 @@ $NetBSD: patch-ab,v 1.2 2005/10/26 04:29:01 minskim Exp $
 -	@cd ./tcldesk; tar cf - * | (cd $(SCRIPT_INSTALL_DIR); tar xvf -)
 -	@cd ..
 +	$(BSD_INSTALL_DATA_DIR) $(SCRIPT_INSTALL_DIR)
-+	@cd ./tcldesk; ${PAX} -rwpm * ${SCRIPT_INSTALL_DIR}; cd ..
++	@cd ./tcldesk; pax -rwpm * ${SCRIPT_INSTALL_DIR}; cd ..
  	@cp ChangeLog $(SCRIPT_INSTALL_DIR)/doc/ChangeLog
  	@echo "=== Setting permissions..."
  	find $(SCRIPT_INSTALL_DIR) -type f -exec chmod a+r {} \;
diff --git a/sysutils/tkdesk/patches/patch-aj b/sysutils/tkdesk/patches/patch-aj
index caac33674d2..da7805fe15c 100644
--- a/sysutils/tkdesk/patches/patch-aj
+++ b/sysutils/tkdesk/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.3 2006/04/21 12:09:57 joerg Exp $
+$NetBSD: patch-aj,v 1.4 2014/02/22 07:53:47 obache Exp $
 
---- libdesk/tixImgXpm.c.orig	2004-04-13 21:32:20.000000000 -0500
+--- libdesk/tixImgXpm.c.orig	2014-02-22 04:59:11.000000000 +0000
 +++ libdesk/tixImgXpm.c
-@@ -63,8 +63,6 @@
+@@ -58,8 +58,6 @@
  #include "tkPort.h"*/
  /*#include <tix.h>*/
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aj,v 1.3 2006/04/21 12:09:57 joerg Exp $
  /* constants used only in this file */
  
  #define XPM_MONO		1
-@@ -156,7 +154,7 @@ typedef struct PixmapInstance {
+@@ -151,7 +149,7 @@ typedef struct PixmapInstance {
   */
  
  static int		ImgXpmCreate _ANSI_ARGS_((Tcl_Interp *interp,
@@ -20,16 +20,7 @@ $NetBSD: patch-aj,v 1.3 2006/04/21 12:09:57 joerg Exp $
  			    Tk_ImageType *typePtr, Tk_ImageMaster master,
  			    ClientData *clientDataPtr));
  static ClientData	ImgXpmGet _ANSI_ARGS_((Tk_Window tkwin,
-@@ -177,7 +175,7 @@ Tk_ImageType tixPixmapImageType = {
-     ImgXpmFree,			/* freeProc */
-     ImgXpmDelete,		/* deleteProc */
-     (Tk_ImagePostscriptProc *) NULL, /* postscriptProc ?? */
--    (struct Tk_ImageType *) NULL /* nextPtr */
-+    /* (struct Tk_ImageType *) NULL *//* nextPtr */
- };
- 
- /*
-@@ -242,12 +240,12 @@ static int xpmTableInited = 0;
+@@ -239,12 +237,12 @@ static int xpmTableInited = 0;
   *----------------------------------------------------------------------
   */
  static int
@@ -45,7 +36,7 @@ $NetBSD: patch-aj,v 1.3 2006/04/21 12:09:57 joerg Exp $
  				 * 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
-@@ -257,6 +255,13 @@ ImgXpmCreate(interp, name, argc, argv, t
+@@ -254,6 +252,13 @@ ImgXpmCreate(interp, name, argc, argv, t
  {
      PixmapMaster *masterPtr;
  
@@ -59,7 +50,7 @@ $NetBSD: patch-aj,v 1.3 2006/04/21 12:09:57 joerg Exp $
      masterPtr = (PixmapMaster *) ckalloc(sizeof(PixmapMaster));
      masterPtr->tkMaster = master;
      masterPtr->interp = interp;
-@@ -270,10 +275,11 @@ ImgXpmCreate(interp, name, argc, argv, t
+@@ -267,10 +272,11 @@ ImgXpmCreate(interp, name, argc, argv, t
      masterPtr->isDataAlloced = 0;
      masterPtr->instancePtr = NULL;