summaryrefslogtreecommitdiff
path: root/sysutils/tkdesk/patches
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/tkdesk/patches')
-rw-r--r--sysutils/tkdesk/patches/patch-aa88
-rw-r--r--sysutils/tkdesk/patches/patch-ab13
-rw-r--r--sysutils/tkdesk/patches/patch-ac26
-rw-r--r--sysutils/tkdesk/patches/patch-ad22
-rw-r--r--sysutils/tkdesk/patches/patch-af19
-rw-r--r--sysutils/tkdesk/patches/patch-ag23
-rw-r--r--sysutils/tkdesk/patches/patch-ah26
-rw-r--r--sysutils/tkdesk/patches/patch-ai13
-rw-r--r--sysutils/tkdesk/patches/patch-aj22
9 files changed, 51 insertions, 201 deletions
diff --git a/sysutils/tkdesk/patches/patch-aa b/sysutils/tkdesk/patches/patch-aa
index be4979cd794..5204936d2a5 100644
--- a/sysutils/tkdesk/patches/patch-aa
+++ b/sysutils/tkdesk/patches/patch-aa
@@ -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 -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
+- 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
- 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
+- 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
+ 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 --git a/sysutils/tkdesk/patches/patch-ab b/sysutils/tkdesk/patches/patch-ab
index fef1a048551..0f339d2e7bf 100644
--- a/sysutils/tkdesk/patches/patch-ab
+++ b/sysutils/tkdesk/patches/patch-ab
@@ -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 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/07/03 09:27:00 dmcmahill Exp $
# Path name to use when installing library scripts:
SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TKDESK_LIBRARY)
-@@ -187,26 +187,28 @@
+@@ -173,28 +173,29 @@ tkdesk_script:
rm_tkdesk_script:
@rm -f tkdesk
@@ -31,8 +31,11 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/07/03 09:27:00 dmcmahill Exp $
+ $(BSD_INSTALL_SCRIPT) $$f $(BIN_INSTALL_DIR) ;\
done
@echo "=== Installing TkDesk's library..."
+- @cd ./tcldesk; tar cf - * | (cd $(SCRIPT_INSTALL_DIR); tar xvf -)
+- @cd ..
+ $(BSD_INSTALL_DATA_DIR) $(SCRIPT_INSTALL_DIR)
- @cd ./tcldesk; tar cf - * | (cd $(SCRIPT_INSTALL_DIR); tar xvf -)
++ @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 {} \;
find $(SCRIPT_INSTALL_DIR) -type d -exec chmod a+rx {} \;
diff --git a/sysutils/tkdesk/patches/patch-ac b/sysutils/tkdesk/patches/patch-ac
index e0105971fb3..ac4c0798e67 100644
--- a/sysutils/tkdesk/patches/patch-ac
+++ b/sysutils/tkdesk/patches/patch-ac
@@ -1,17 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/07/03 09:27:00 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.2 2005/10/26 04:29:01 minskim Exp $
---- tcldesk/configs/AppBar.orig Sun Nov 14 14:07:53 1999
-+++ tcldesk/configs/AppBar Sun Sep 2 23:09:23 2001
-@@ -282,7 +282,7 @@
- {{TkDesk User's Guide } {dsk_help guide}}
- {{FAQ } {dsk_help faq}}
- {{Changes} {dsk_help changes}}
-- {{TkDesk Homepage } {dsk_netscape url http://people.mainz.netsurf.de/~bolik/tkdesk/ window}}
-+ {{TkDesk Homepage } {dsk_netscape url http://tkdesk.sourceforge.net/ window}}
- -
- {{Manual Page ...} {
- dsk_read_string {Show manual page for: (e.g. col(1))} {
-@@ -392,7 +392,7 @@
+--- tcldesk/configs/AppBar.orig 2004-04-13 01:41:00.000000000 -0500
++++ tcldesk/configs/AppBar
+@@ -405,7 +405,7 @@ set tkdesk(appbar) {
}
}
{{Superuser}
@@ -20,12 +11,3 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/07/03 09:27:00 dmcmahill Exp $
{{Edit /etc/hosts} {dsk_exec_as_root vi /etc/hosts}}
}
-
-@@ -476,7 +476,7 @@
- }}
- }
- {{Locations}
-- {{TkDesk Homepage } {dsk_netscape url http://people.mainz.netsurf.de/~bolik/tkdesk/ window}}
-+ {{TkDesk Homepage } {dsk_netscape url http://tkdesk.sourceforge.net/ window}}
- {{AltaVista } {dsk_netscape url http://www.altavista.digital.com window}}
- {{Tcl/Tk at Sun } {dsk_netscape url http://www.sunlabs.com/research/tcl window}}
- }
diff --git a/sysutils/tkdesk/patches/patch-ad b/sysutils/tkdesk/patches/patch-ad
index 5bdaae57def..e69de29bb2d 100644
--- a/sysutils/tkdesk/patches/patch-ad
+++ b/sysutils/tkdesk/patches/patch-ad
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/07/03 09:27:00 dmcmahill Exp $
-
---- tcldesk/configs/AppBar_Be.orig Sun Nov 14 14:07:53 1999
-+++ tcldesk/configs/AppBar_Be Sun Sep 2 23:10:14 2001
-@@ -241,7 +241,7 @@
- {{TkDesk User's Guide } {dsk_help guide}}
- {{FAQ } {dsk_help faq}}
- {{Changes} {dsk_help changes}}
-- {{TkDesk Homepage } {dsk_netscape url http://people.mainz.netsurf.de/~bolik/tkdesk/ window}}
-+ {{TkDesk Homepage } {dsk_netscape url http://tkdesk.sourceforge.net/ window}}
- -
- {{Manual Page ...} {
- dsk_read_string {Show manual page for: (e.g. col(1))} {
-@@ -333,7 +333,7 @@
- }}
- }
- {{Locations}
-- {{TkDesk Homepage } {dsk_netscape url http://people.mainz.netsurf.de/~bolik/tkdesk/ window}}
-+ {{TkDesk Homepage } {dsk_netscape url http://tkdesk.sourceforge.net/ window}}
- {{AltaVista } {dsk_netscape url http://www.altavista.digital.com window}}
- {{Tcl/Tk at Sun } {dsk_netscape url http://www.sunlabs.com/research/tcl window}}
- }
diff --git a/sysutils/tkdesk/patches/patch-af b/sysutils/tkdesk/patches/patch-af
index f96840c8196..e69de29bb2d 100644
--- a/sysutils/tkdesk/patches/patch-af
+++ b/sysutils/tkdesk/patches/patch-af
@@ -1,19 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/07/03 09:27:00 dmcmahill Exp $
-
---- tcldesk/appbar.tcl.orig Sun Nov 14 16:07:47 1999
-+++ tcldesk/appbar.tcl Sun May 28 16:30:32 2000
-@@ -631,12 +631,13 @@
- }
- }
-
--proc _appbar_dd_action {cmd flist} {
-+proc _appbar_dd_action {cmd args} {
- global tkdesk
-
- catch "wm withdraw $tkdesk(dd_token_window)"
- update
-
-+ set flist $args
- if {[string first %A $cmd] > -1} {
- set cmd [string_replace $cmd %A $flist]
- } else {
diff --git a/sysutils/tkdesk/patches/patch-ag b/sysutils/tkdesk/patches/patch-ag
index 22ca6db7ec1..e69de29bb2d 100644
--- a/sysutils/tkdesk/patches/patch-ag
+++ b/sysutils/tkdesk/patches/patch-ag
@@ -1,23 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/07/03 09:27:00 dmcmahill Exp $
-
---- tcldesk/delete.tcl.orig Sun Nov 14 16:07:47 1999
-+++ tcldesk/delete.tcl Sun May 28 16:30:32 2000
-@@ -381,12 +381,12 @@
- if {[cb_okcancel "Empty trash can?\nThis will delete ALL files in the trash can!"] == 0} {
- dsk_sound dsk_really_deleting
- if {$anum == 1} {set fll "File"} {set fll "Files"}
-- #set tlist ""
-- #foreach f $alist {
-- # lappend tlist [string trimright \
-- # $tkdesk(trashdir)/$f " "]
-- #}
-- dsk_bgexec "$tkdesk(cmd,rm) .* *" "Deleting $anum $fll..."
-+ set tlist ""
-+ foreach f $alist {
-+ lappend tlist [string trimright \
-+ $tkdesk(trashdir)/$f " "]
-+ }
-+ dsk_bgexec "$tkdesk(cmd,rm) $tlist" "Deleting $anum $fll..."
- dsk_refresh $tkdesk(trashdir)
- }
- }
diff --git a/sysutils/tkdesk/patches/patch-ah b/sysutils/tkdesk/patches/patch-ah
index e42da816f80..e69de29bb2d 100644
--- a/sysutils/tkdesk/patches/patch-ah
+++ b/sysutils/tkdesk/patches/patch-ah
@@ -1,26 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2002/07/03 09:27:00 dmcmahill Exp $
-
---- tkdesk.main.orig Sun Nov 14 16:07:45 1999
-+++ tkdesk.main Sun May 28 16:30:32 2000
-@@ -682,6 +682,12 @@
- blt_drag&drop errors ""
- }
-
-+# Disable BLT's built-in d&d bindings (except for motion):
-+catch {
-+ bind BltDrag&DropButton2 <Button-2> {}
-+ bind BltDrag&DropButton2 <ButtonRelease-2> {}
-+}
-+
- #
- # ==== Set misc. global variables ============================================
- #
-@@ -1004,7 +1010,7 @@
- }
-
- foreach obj [itcl_info objects -class dsk_Editor] {
-- if [winfo exists $obj] {
-+ if [winfo exists [$obj getToplevel]] {
- if {[$obj close_win] == "cancel"} {
- return
- }
diff --git a/sysutils/tkdesk/patches/patch-ai b/sysutils/tkdesk/patches/patch-ai
index 28dde21f11d..e69de29bb2d 100644
--- a/sysutils/tkdesk/patches/patch-ai
+++ b/sysutils/tkdesk/patches/patch-ai
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2002/07/03 09:27:00 dmcmahill Exp $
-
---- tcldesk/find.tcl.orig Sun Nov 14 16:07:47 1999
-+++ tcldesk/find.tcl Sun May 28 16:30:32 2000
-@@ -805,7 +805,7 @@
- set flist ""
- set list [$dlb get]
- foreach f $fl {
-- lappend flist [lindex [lindex $list $f] 0]
-+ lappend flist [lindex [split [lindex $list $f] \t] 0]
- }
-
- set nfiles 0
diff --git a/sysutils/tkdesk/patches/patch-aj b/sysutils/tkdesk/patches/patch-aj
index e57d04249aa..b42d4c826d6 100644
--- a/sysutils/tkdesk/patches/patch-aj
+++ b/sysutils/tkdesk/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.1.1.1 2002/07/03 09:27:01 dmcmahill Exp $
+$NetBSD: patch-aj,v 1.2 2005/10/26 04:29:01 minskim Exp $
---- libdesk/tixImgXpm.c.orig Sun Nov 14 16:07:47 1999
-+++ libdesk/tixImgXpm.c Sun Sep 2 22:41:43 2001
-@@ -156,7 +156,7 @@
+--- libdesk/tixImgXpm.c.orig 2004-04-13 21:32:20.000000000 -0500
++++ libdesk/tixImgXpm.c
+@@ -156,7 +156,7 @@ typedef struct PixmapInstance {
*/
static int ImgXpmCreate _ANSI_ARGS_((Tcl_Interp *interp,
@@ -11,16 +11,16 @@ $NetBSD: patch-aj,v 1.1.1.1 2002/07/03 09:27:01 dmcmahill Exp $
Tk_ImageType *typePtr, Tk_ImageMaster master,
ClientData *clientDataPtr));
static ClientData ImgXpmGet _ANSI_ARGS_((Tk_Window tkwin,
-@@ -176,7 +176,7 @@
- ImgXpmDisplay, /* displayProc */
+@@ -177,7 +177,7 @@ Tk_ImageType tixPixmapImageType = {
ImgXpmFree, /* freeProc */
ImgXpmDelete, /* deleteProc */
-- (Tk_ImageType *) NULL /* nextPtr */
-+ /* (Tk_ImageType *) NULL *//* nextPtr */
+ (Tk_ImagePostscriptProc *) NULL, /* postscriptProc ?? */
+- (struct Tk_ImageType *) NULL /* nextPtr */
++ /* (struct Tk_ImageType *) NULL *//* nextPtr */
};
/*
-@@ -241,12 +241,12 @@
+@@ -242,12 +242,12 @@ static int xpmTableInited = 0;
*----------------------------------------------------------------------
*/
static int
@@ -36,7 +36,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2002/07/03 09:27:01 dmcmahill 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
-@@ -256,6 +256,13 @@
+@@ -257,6 +257,13 @@ ImgXpmCreate(interp, name, argc, argv, t
{
PixmapMaster *masterPtr;
@@ -50,7 +50,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2002/07/03 09:27:01 dmcmahill Exp $
masterPtr = (PixmapMaster *) ckalloc(sizeof(PixmapMaster));
masterPtr->tkMaster = master;
masterPtr->interp = interp;
-@@ -269,10 +276,11 @@
+@@ -270,10 +277,11 @@ ImgXpmCreate(interp, name, argc, argv, t
masterPtr->isDataAlloced = 0;
masterPtr->instancePtr = NULL;
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-03 14:04:11 +0000