[pkgsrc/trunk]: pkgsrc/sysutils/tkdesk Update tkdesk to 2.0. This version ha...

[minskim <minskim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2aad1b0c9efa
branches:  trunk
changeset: 501686:2aad1b0c9efa
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Wed Oct 26 04:29:01 2005 +0000

description:
Update tkdesk to 2.0.  This version has a problem as shown in PR
pkg/25274, but 1.x didn't build at all since the recent blt update.
perry@ will work on fixing this packge.

Changes:
- Tcl/Tk 8.4 compatibility
- Dropped support for Tcl/Tk 7.x
- Mouse wheel support
- diff support
- Improved configure script
- New TkDesk logo

diffstat:

 sysutils/tkdesk/Makefile         |  16 ++++---
 sysutils/tkdesk/PLIST            |  50 +++------------------
 sysutils/tkdesk/distinfo         |  26 +++++-----
 sysutils/tkdesk/patches/patch-aa |  90 ++++++++++++---------------------------
 sysutils/tkdesk/patches/patch-ab |  13 +++--
 sysutils/tkdesk/patches/patch-ac |  26 +---------
 sysutils/tkdesk/patches/patch-ad |  22 ---------
 sysutils/tkdesk/patches/patch-af |  19 --------
 sysutils/tkdesk/patches/patch-ag |  23 ----------
 sysutils/tkdesk/patches/patch-ah |  26 -----------
 sysutils/tkdesk/patches/patch-ai |  13 -----
 sysutils/tkdesk/patches/patch-aj |  22 ++++----
 12 files changed, 82 insertions(+), 264 deletions(-)

diffs (truncated from 537 to 300 lines):

diff -r 94635e23b5b4 -r 2aad1b0c9efa sysutils/tkdesk/Makefile
--- a/sysutils/tkdesk/Makefile  Wed Oct 26 04:24:05 2005 +0000
+++ b/sysutils/tkdesk/Makefile  Wed Oct 26 04:29:01 2005 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:29 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/10/26 04:29:01 minskim Exp $
 #
 
-DISTNAME=      tkdesk-1.2
-PKGREVISION=   1
+DISTNAME=      tkdesk-2.0
 CATEGORIES=    sysutils
 MASTER_SITES=  http://tkdesk.sourceforge.net/dist/
 
@@ -15,14 +14,17 @@
                --with-tk=${BUILDLINK_PREFIX.tk}/lib    \
                --with-itcl=${BUILDLINK_PREFIX.tcl-itcl}/lib    \
                --with-blt=${BUILDLINK_PREFIX.blt}/lib
+MAKE_ENV+=     LIB_RUNTIME_DIR="-L${BUILDLINK_PREFIX.tcl-itcl}/lib" \
+               PAX=${PAX:Q}
+
+.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 -name '*' -exec ${TOUCH} {} ';'
 
-.include "../../lang/tcl83/buildlink3.mk"
-.include "../../lang/tcl-itcl/buildlink3.mk"
-.include "../../x11/blt/buildlink3.mk"
-.include "../../x11/tk83/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 94635e23b5b4 -r 2aad1b0c9efa sysutils/tkdesk/PLIST
--- a/sysutils/tkdesk/PLIST     Wed Oct 26 04:24:05 2005 +0000
+++ b/sysutils/tkdesk/PLIST     Wed Oct 26 04:29:01 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/03 09:27:00 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/10/26 04:29:01 minskim Exp $
 bin/cd-tkdesk
 bin/ed-tkdesk
 bin/od-tkdesk
@@ -58,7 +58,6 @@
 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
@@ -74,7 +73,7 @@
 lib/tkdesk/cpanels.tcl
 lib/tkdesk/delete.tcl
 lib/tkdesk/diary.tcl
-lib/tkdesk/doc/CHANGES
+lib/tkdesk/doc/ChangeLog
 lib/tkdesk/doc/Guide
 lib/tkdesk/doc/License
 lib/tkdesk/doc/QuickStart
@@ -168,6 +167,7 @@
 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
@@ -268,6 +268,8 @@
 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
@@ -403,6 +405,7 @@
 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
@@ -415,10 +418,12 @@
 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
@@ -530,52 +535,13 @@
 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
 man/man1/cd-tkdesk.1
 man/man1/ed-tkdesk.1
 man/man1/od-tkdesk.1
 man/man1/tkdesk.1
-@dirrm lib/tkdesk/static/tk8.0
-@dirrm lib/tkdesk/static/tcl8.0
-@dirrm lib/tkdesk/static/itcl3.0
-@dirrm lib/tkdesk/static
 @dirrm lib/tkdesk/sounds
 @dirrm lib/tkdesk/images/xbm
 @dirrm lib/tkdesk/images/next
diff -r 94635e23b5b4 -r 2aad1b0c9efa sysutils/tkdesk/distinfo
--- a/sysutils/tkdesk/distinfo  Wed Oct 26 04:24:05 2005 +0000
+++ b/sysutils/tkdesk/distinfo  Wed Oct 26 04:29:01 2005 +0000
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 13:40:58 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/10/26 04:29:01 minskim Exp $
 
-SHA1 (tkdesk-1.2.tar.gz) = 6810b92a882956745c50ceb80eea72167dc24d94
-RMD160 (tkdesk-1.2.tar.gz) = bd17e981dbd53dba92a2bba83b77a847de313333
-Size (tkdesk-1.2.tar.gz) = 1079153 bytes
-SHA1 (patch-aa) = a37188993358a78d3e8a9ec46b08a3f1c0831c60
-SHA1 (patch-ab) = e93006a1f1eeb8d5060465ea73ad95fa234744c4
-SHA1 (patch-ac) = bf3e11e85f02fc2e84ff913e2dc8c14fac00e1bb
-SHA1 (patch-ad) = 593fff0281d7caf907fc5cd34f71088d12350f8c
+SHA1 (tkdesk-2.0.tar.gz) = 6ee7e290c094a957b92647fa83e23b0765556bf7
+RMD160 (tkdesk-2.0.tar.gz) = bd3983465e44aa0c294d1936fc5f3f450535d9c2
+Size (tkdesk-2.0.tar.gz) = 907432 bytes
+SHA1 (patch-aa) = c4ce261aa0032a6ff41cbd4d615aca0d9592be35
+SHA1 (patch-ab) = 0250bf748da921d25b2c0e96841f3fbed42fd96e
+SHA1 (patch-ac) = 286a2bb4177431f87b778ed943cd57961aeb48ab
+SHA1 (patch-ad) = da39a3ee5e6b4b0d3255bfef95601890afd80709
 SHA1 (patch-ae) = c09cd944af50c2a31020a7478c1568e847b0cb02
-SHA1 (patch-af) = 86db9011313d0ba914c082e46253e65de09f843b
-SHA1 (patch-ag) = 414495caff04710a026f59ffa1405308026ac052
-SHA1 (patch-ah) = f6c29999ea661ea6a67495116aee1cbfb6225f7e
-SHA1 (patch-ai) = ffb1c48e1a593bf74d710f97dfa5c7b2d069d0d1
-SHA1 (patch-aj) = fd8fb4132b54d6f3605266dbbb231f5f04f5894c
+SHA1 (patch-af) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-ag) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-ah) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-ai) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-aj) = e0aa89498cff3cde0be007c0586e9d32acb411c1
 SHA1 (patch-ak) = 441a1eefd5872786981b25aa07482a8d6d9515aa
diff -r 94635e23b5b4 -r 2aad1b0c9efa sysutils/tkdesk/patches/patch-aa
--- a/sysutils/tkdesk/patches/patch-aa  Wed Oct 26 04:24:05 2005 +0000
+++ b/sysutils/tkdesk/patches/patch-aa  Wed Oct 26 04:29:01 2005 +0000
@@ -1,64 +1,32 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/07/03 09:27:00 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.2 2005/10/26 04:29:01 minskim Exp $
 
---- configure.orig     Fri Jun 28 14:26:26 2002
+--- configure.orig     2004-04-13 22:39:47.000000000 -0500
 +++ configure
-@@ -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.
-@@ -681,8 +681,9 @@
-   if test -z "$ITCLCONF_PATH" ; then
-     ITCLCONF_PATH=$TCLCONF_PATH
+@@ -1548,10 +1548,10 @@ else
+      ITCL_LIB_SPEC="-L${TCLCONF_PATH} -litcl3.1"
+      ITCL_LIB_STATIC=${TCLCONF_PATH}/libitcl3.1.a
+   fi
+-  if test -f "${TCLCONF_PATH}/libitcl3.2.so" -o -f "${TCLCONF_PATH}/libitcl3.2.a"
++  if test -f "${TCLCONF_PATH}/libitcl32.so" -o -f "${TCLCONF_PATH}/libitcl32.a"
+   then
+-     ITCL_LIB_SPEC="-L${TCLCONF_PATH} -litcl3.2"
+-     ITCL_LIB_STATIC=${TCLCONF_PATH}/libitcl3.2.a
++     ITCL_LIB_SPEC="-L${TCLCONF_PATH} -litcl32"
++     ITCL_LIB_STATIC=${TCLCONF_PATH}/libitcl32.a
    fi
--  if test -r $ITCLCONF_PATH/itclConfig.sh ; then
--    . $ITCLCONF_PATH/itclConfig.sh
-+  if test -r $ITCLCONF_PATH/tcl/itcl3.2/pkgIndex.tcl ; then
-+    ITCL_VERSION="32"
-+    ITCL_MAJOR_VERSION=3
-   else
-     ITCL_VERSION="no"
-     ITCL_MAJOR_VERSION=0
-@@ -713,11 +714,14 @@
-   NEED_BLT_LIB=lib_blt
-   echo "$ac_t""./blt" 1>&6
- else
--  BLT_LIB_SPEC="-L$BLT_LIB_PATH -lBLT"
--  BLT_LIB_STATIC=$BLT_LIB_PATH/libBLT.a
-+  if test -r $BLT_LIB_PATH/tcl/blt2.4/pkgIndex.tcl ; then
-+    BLT_VERSION="24"
-+  fi
-+  BLT_LIB_SPEC="-L$BLT_LIB_PATH -lBLT${BLT_VERSION}"
-+  BLT_LIB_STATIC=$BLT_LIB_PATH/libBLT${BLT_VERSION}.a
-   NEED_BLT_LIB=
--  if test   ! -f $BLT_LIB_PATH/libBLT.a \
--         -a ! -f $BLT_LIB_PATH/libBLT.so
-+  if test   ! -f $BLT_LIB_PATH/libBLT${BLT_VERSION}.a \
-+         -a ! -f $BLT_LIB_PATH/libBLT${BLT_VERSION}.so
-   then
-     if test   ! -f $BLT_LIB_PATH/lib/libBLT.a \
-            -a ! -f $BLT_LIB_PATH/lib/libBLT.so
-@@ -742,8 +746,8 @@
-   TCL_INCLUDE_PATH=$TCL_EXEC_PREFIX/include
-   TK_INCLUDE_PATH=$TCL_INCLUDE_PATH
-   NEED_ITCL_LIB=
--  # ITCL_LIB_SPEC already set in itclConfig.sh
--  ITCL_LIB_STATIC=${TCLCONF_PATH}/libitcl${ITCL_VERSION}.a
-+  ITCL_LIB_SPEC="-L${ITCLCONF_PATH} -litcl${ITCL_VERSION}"
-+  ITCL_LIB_STATIC=${ITCLCONF_PATH}/libitcl${ITCL_VERSION}.a
- else
-   TCL_INCLUDE_PATH=$TCL_EXEC_PREFIX/include
-   TK_INCLUDE_PATH=$TK_EXEC_PREFIX/include
+ fi
+ 
+@@ -1570,11 +1570,9 @@ else
+    BLT_LIB_SPEC="-L$BLT_LIB_PATH -lBLT"
+    BLT_LIB_STATIC=$BLT_LIB_PATH/libBLT.a
+    NEED_BLT_LIB=
+-   if test   ! -f $BLT_LIB_PATH/libBLT.a \
+-          -a ! -f $BLT_LIB_PATH/libBLT.so
++   if test   ! -f $BLT_LIB_PATH/libBLT.a
+    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/libBLT.a
+       then
+        echo
+        { { echo "$as_me:$LINENO: error: could not find libBLT.a or libBLT.so in $BLT_LIB_PATH or in $BLT_LIB_PATH/lib." >&5
diff -r 94635e23b5b4 -r 2aad1b0c9efa sysutils/tkdesk/patches/patch-ab
--- a/sysutils/tkdesk/patches/patch-ab  Wed Oct 26 04:24:05 2005 +0000
+++ b/sysutils/tkdesk/patches/patch-ab  Wed Oct 26 04:29:01 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/07/03 09:27:00 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.2 2005/10/26 04:29:01 minskim Exp $
 
---- Makefile.in.orig   Mon Nov 15 06:07:45 1999
+--- Makefile.in.orig   2004-04-14 17:31:17.000000000 -0500
 +++ Makefile.in
-@@ -28,7 +28,7 @@
+@@ -28,7 +28,7 @@ exec_prefix =        @exec_prefix@
  INSTALL_ROOT =
  
  # Directory from which TkDesk will reference its library of Tcl scripts:
@@ -11,7 +11,7 @@