Date: Mon, 3 Sep 2001 00:00:51 -0500 (CDT) From: Andy Sparrow <spadger@best.com> To: FreeBSD-gnats-submit@freebsd.org Cc: lkoeller@cc.fh-lippe.de Subject: ports/30279: TkDesk is broken Message-ID: <20010903050051.29CB93E7C@CRWdog.demon.co.uk>
next in thread | raw e-mail | index | archive | help
>Number: 30279 >Category: ports >Synopsis: TkDesk is broken >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Sep 02 22:10:00 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Andy Sparrow >Release: FreeBSD 4.4-RC i386 >Organization: None Discernable >Environment: System: FreeBSD omni.geek4food.org 4.4-RC FreeBSD 4.4-RC #52: Sun Aug 26 12:42:32 CDT 2001 root@omni.geek4food.org:/usr/src/sys/compile/o6k i386 >Description: Problem report is entirely correct. >How-To-Repeat: Try to build port. >Fix: Please apply enclosed patch, which updates port to Tcl/Tk 8.2, itcl3.2 and the latest version of 'BLT'. In particular, please note new file 'patch-aj': diff -ruN tkdesk.orig/Makefile tkdesk/Makefile --- tkdesk.orig/Makefile Mon Feb 5 15:00:53 2001 +++ tkdesk/Makefile Sun Sep 2 23:58:58 2001 @@ -7,21 +7,21 @@ PORTNAME= tkdesk PORTVERSION= 1.2 -CATEGORIES= x11-fm tk82 -MASTER_SITES= http://sd.znet.com/~jchris/tkdesk/ \ +CATEGORIES= x11-fm tk83 +MASTER_SITES= http://tkdesk.sourceforge.net/dist/ \ ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= X11/desktop -MAINTAINER= andy@geek4food.org +MAINTAINER= spadger@best.com -LIB_DEPENDS= itcl30.1:${PORTSDIR}/lang/itcl \ +LIB_DEPENDS= itcl32:${PORTSDIR}/lang/itcl \ BLT24.2:${PORTSDIR}/x11-toolkits/blt USE_GMAKE= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}/lib/tcl8.2 -CONFIGURE_ARGS+= --with-tk=${LOCALBASE}/lib/tk8.2 -CONFIGURE_ARGS+= --with-itcl=${LOCALBASE}/lib/itcl3.0 +CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}/lib/tcl8.3 +CONFIGURE_ARGS+= --with-tk=${LOCALBASE}/lib/tk8.3 +CONFIGURE_ARGS+= --with-itcl=${LOCALBASE}/lib/itcl3.2 CONFIGURE_ARGS+= --with-blt=${LOCALBASE}/lib MAN1= tkdesk.1 cd-tkdesk.1 ed-tkdesk.1 od-tkdesk.1 diff -ruN tkdesk.orig/files/patch-aa tkdesk/files/patch-aa --- tkdesk.orig/files/patch-aa Mon May 1 12:58:35 2000 +++ tkdesk/files/patch-aa Sun Sep 2 22:08:18 2001 @@ -1,16 +1,52 @@ ---- configure.orig Sun Nov 14 17:07:45 1999 -+++ configure Mon May 1 13:40:36 2000 -@@ -739,14 +739,14 @@ +--- configure.orig Sun Nov 14 16:07:45 1999 ++++ configure Sun Sep 2 22:02:05 2001 +@@ -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. +@@ -678,11 +678,9 @@ + if test "$TCL_MAJOR_VERSION" -ge 8; then + echo $ac_n "checking for itcl 3.x""... $ac_c" 1>&6 + echo "configure:681: checking for itcl 3.x" >&5 +- if test -z "$ITCLCONF_PATH" ; then +- ITCLCONF_PATH=$TCLCONF_PATH +- fi +- if test -r $ITCLCONF_PATH/itclConfig.sh ; then +- . $ITCLCONF_PATH/itclConfig.sh ++ if test -r $ITCLCONF_PATH/itcl.tcl ; then ++ ITCL_VERSION="32" ++ ITCL_MAJOR_VERSION=3 + else + ITCL_VERSION="no" + ITCL_MAJOR_VERSION=0 +@@ -739,14 +737,15 @@ # # ----------------------------------------------------------------------- if test "$ITCL_VERSION" != "no" ; then - TCL_INCLUDE_PATH=$TCL_EXEC_PREFIX/include - TK_INCLUDE_PATH=$TCL_INCLUDE_PATH +- NEED_ITCL_LIB= + TCL_INCLUDE_PATH=$TCL_EXEC_PREFIX/include/tcl${TCL_VERSION} + TK_INCLUDE_PATH=$TK_EXEC_PREFIX/include/tk${TK_VERSION} - NEED_ITCL_LIB= ++ NEED_ITCL_LIB=lib_itcl # ITCL_LIB_SPEC already set in itclConfig.sh - ITCL_LIB_STATIC=${TCLCONF_PATH}/libitcl${ITCL_VERSION}.a +- ITCL_LIB_STATIC=${TCLCONF_PATH}/libitcl${ITCL_VERSION}.a ++ ITCL_LIB_SPEC="-L${PREFIX}/lib -litcl${ITCL_VERSION}" ++ ITCL_LIB_STATIC=${PREFIX}/libitcl${ITCL_VERSION}.a else - TCL_INCLUDE_PATH=$TCL_EXEC_PREFIX/include - TK_INCLUDE_PATH=$TK_EXEC_PREFIX/include @@ -19,3 +55,4 @@ NEED_ITCL_LIB=lib_itcl ITCL_LIB_SPEC=itcl/libitcl.a ITCL_LIB_STATIC=itcl/libitcl.a + diff -ruN tkdesk.orig/files/patch-ab tkdesk/files/patch-ab --- tkdesk.orig/files/patch-ab Mon May 1 12:58:35 2000 +++ tkdesk/files/patch-ab Sun Sep 2 23:04:11 2001 @@ -1,11 +1,11 @@ --- Makefile.in~ Sun Sep 20 20:41:40 1998 -+++ Makefile.in Sat Feb 13 12:53:36 1999 ++++ Makefile.in Sun Sep 2 23:03:53 2001 @@ -194,7 +194,7 @@ find $(SCRIPT_INSTALL_DIR) -type f -exec chmod a+r {} \; 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.2 mkindex ++ cd $(SCRIPT_INSTALL_DIR); tclsh8.3 mkindex @echo "=== Installing the manual pages..." @for f in tkdesk.1 cd-tkdesk.1 ed-tkdesk.1 od-tkdesk.1; do \ echo "installing $$f" ;\ diff -ruN tkdesk.orig/files/patch-ac tkdesk/files/patch-ac --- tkdesk.orig/files/patch-ac Sun May 28 22:33:09 2000 +++ tkdesk/files/patch-ac Sun Sep 2 23:09:38 2001 @@ -1,11 +1,11 @@ --- tcldesk/configs/AppBar.orig Sun Nov 14 14:07:53 1999 -+++ tcldesk/configs/AppBar Thu Apr 27 21:48:58 2000 ++++ 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://sd.znet.com/~jchris/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))} { @@ -23,7 +23,7 @@ } {{Locations} - {{TkDesk Homepage } {dsk_netscape url http://people.mainz.netsurf.de/~bolik/tkdesk/ window}} -+ {{TkDesk Homepage } {dsk_netscape url http://sd.znet.com/~jchris/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 -ruN tkdesk.orig/files/patch-ad tkdesk/files/patch-ad --- tkdesk.orig/files/patch-ad Sun May 28 22:33:09 2000 +++ tkdesk/files/patch-ad Sun Sep 2 23:10:27 2001 @@ -1,11 +1,11 @@ --- tcldesk/configs/AppBar_Be.orig Sun Nov 14 14:07:53 1999 -+++ tcldesk/configs/AppBar_Be Thu Apr 27 21:48:34 2000 ++++ 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://sd.znet.com/~jchris/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))} { @@ -14,7 +14,7 @@ } {{Locations} - {{TkDesk Homepage } {dsk_netscape url http://people.mainz.netsurf.de/~bolik/tkdesk/ window}} -+ {{TkDesk Homepage } {dsk_netscape url http://sd.znet.com/~jchris/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 -ruN tkdesk.orig/files/patch-aj tkdesk/files/patch-aj --- tkdesk.orig/files/patch-aj Wed Dec 31 18:00:00 1969 +++ tkdesk/files/patch-aj Sun Sep 2 22:42:27 2001 @@ -0,0 +1,63 @@ +--- 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 @@ + */ + + static int ImgXpmCreate _ANSI_ARGS_((Tcl_Interp *interp, +- char *name, int argc, char **argv, ++ char *name, int objc, Tcl_Obj *CONST objv[], + Tk_ImageType *typePtr, Tk_ImageMaster master, + ClientData *clientDataPtr)); + static ClientData ImgXpmGet _ANSI_ARGS_((Tk_Window tkwin, +@@ -176,7 +176,7 @@ + ImgXpmDisplay, /* displayProc */ + ImgXpmFree, /* freeProc */ + ImgXpmDelete, /* deleteProc */ +- (Tk_ImageType *) NULL /* nextPtr */ ++ /* (Tk_ImageType *) NULL *//* nextPtr */ + }; + + /* +@@ -241,12 +241,12 @@ + *---------------------------------------------------------------------- + */ + static int +-ImgXpmCreate(interp, name, argc, argv, typePtr, master, clientDataPtr) ++ImgXpmCreate(interp, name, objc, objv, typePtr, master, clientDataPtr) + Tcl_Interp *interp; /* Interpreter for application containing + * image. */ + char *name; /* Name to use for image. */ +- int argc; /* Number of arguments. */ +- char **argv; /* Argument strings for options (doesn't ++ int objc; /* Number of arguments. */ ++ Tcl_Obj *CONST objv[]; /* Argument strings for options (doesn't + * 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 @@ + { + PixmapMaster *masterPtr; + ++ int i; ++ char **argv = (char **) Tcl_Alloc(objc * sizeof(char*)); ++ for (i=0; i < objc; i++) { ++ ++ argv[i] = Tcl_GetString(objv[i]); ++ } ++ + masterPtr = (PixmapMaster *) ckalloc(sizeof(PixmapMaster)); + masterPtr->tkMaster = master; + masterPtr->interp = interp; +@@ -269,10 +276,11 @@ + masterPtr->isDataAlloced = 0; + masterPtr->instancePtr = NULL; + +- if (ImgXpmConfigureMaster(masterPtr, argc, argv, 0) != TCL_OK) { ++ if (ImgXpmConfigureMaster(masterPtr, objc, argv, 0) != TCL_OK) { + ImgXpmDelete((ClientData) masterPtr); + return TCL_ERROR; + } ++ Tcl_Free((char *) argv); + *clientDataPtr = (ClientData) masterPtr; + return TCL_OK; + } >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010903050051.29CB93E7C>