Date: Tue, 19 Nov 2013 11:13:48 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334300 - in head/x11-toolkits/blt: . files Message-ID: <201311191113.rAJBDmJX072854@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Tue Nov 19 11:13:47 2013 New Revision: 334300 URL: http://svnweb.freebsd.org/changeset/ports/334300 Log: - Update to 2.5.3 Added: head/x11-toolkits/blt/files/patch-configure (contents, props changed) head/x11-toolkits/blt/files/patch-generic_bltBgexec.c (contents, props changed) head/x11-toolkits/blt/files/patch-generic_bltDecls.h (contents, props changed) head/x11-toolkits/blt/files/patch-generic_bltGrAxis.c (contents, props changed) head/x11-toolkits/blt/files/patch-generic_bltGrElem.c (contents, props changed) head/x11-toolkits/blt/files/patch-generic_bltGrGrid.c (contents, props changed) head/x11-toolkits/blt/files/patch-generic_bltGrHairs.c (contents, props changed) head/x11-toolkits/blt/files/patch-generic_bltGrLegd.c (contents, props changed) head/x11-toolkits/blt/files/patch-generic_bltGrLine.c (contents, props changed) head/x11-toolkits/blt/files/patch-generic_bltGrMarker.c (contents, props changed) head/x11-toolkits/blt/files/patch-generic_bltGrPen.c (contents, props changed) head/x11-toolkits/blt/files/patch-generic_bltGrPs.c (contents, props changed) head/x11-toolkits/blt/files/patch-generic_bltGraph.c (contents, props changed) head/x11-toolkits/blt/files/patch-generic_bltHash.h.in (contents, props changed) head/x11-toolkits/blt/files/patch-generic_bltInit.c (contents, props changed) head/x11-toolkits/blt/files/patch-generic_bltInt.h (contents, props changed) head/x11-toolkits/blt/files/patch-generic_bltNsUtil.c (contents, props changed) head/x11-toolkits/blt/files/patch-generic_bltScrollbar.c (contents, props changed) head/x11-toolkits/blt/files/patch-generic_bltSwitch.c (contents, props changed) head/x11-toolkits/blt/files/patch-generic_bltTabset.c (contents, props changed) head/x11-toolkits/blt/files/patch-generic_bltTed.c (contents, props changed) head/x11-toolkits/blt/files/patch-generic_bltTree.c (contents, props changed) head/x11-toolkits/blt/files/patch-generic_bltTree.h (contents, props changed) head/x11-toolkits/blt/files/patch-generic_bltTreeCmd.c (contents, props changed) head/x11-toolkits/blt/files/patch-generic_bltTreeView.c (contents, props changed) head/x11-toolkits/blt/files/patch-generic_bltTreeViewColumn.c (contents, props changed) head/x11-toolkits/blt/files/patch-generic_bltUtil.c (contents, props changed) head/x11-toolkits/blt/files/patch-generic_bltVecMath.c (contents, props changed) head/x11-toolkits/blt/files/patch-generic_bltVector.c (contents, props changed) head/x11-toolkits/blt/files/patch-generic_tkButton.c (contents, props changed) head/x11-toolkits/blt/files/patch-library_init.tcl (contents, props changed) Deleted: head/x11-toolkits/blt/files/patch-aa head/x11-toolkits/blt/files/patch-ab head/x11-toolkits/blt/files/patch-ac head/x11-toolkits/blt/files/patch-newertcl head/x11-toolkits/blt/files/patch-parabuild head/x11-toolkits/blt/files/patch-src-shared-Makefile.in head/x11-toolkits/blt/files/patch-use-tkInt head/x11-toolkits/blt/files/patch-warnings Modified: head/x11-toolkits/blt/Makefile head/x11-toolkits/blt/distinfo head/x11-toolkits/blt/pkg-descr head/x11-toolkits/blt/pkg-plist Modified: head/x11-toolkits/blt/Makefile ============================================================================== --- head/x11-toolkits/blt/Makefile Tue Nov 19 10:52:25 2013 (r334299) +++ head/x11-toolkits/blt/Makefile Tue Nov 19 11:13:47 2013 (r334300) @@ -2,50 +2,42 @@ # $FreeBSD$ PORTNAME= blt -PORTVERSION= 2.4z -PORTREVISION= 7 +PORTVERSION= 2.5.3 CATEGORIES= x11-toolkits tk -MASTER_SITES= SF/${PORTNAME}/BLT/BLT%20${PORTVERSION} \ - ftp://ftp.csl.sony.co.jp/pub/kjc/ttt-libs/ -DISTNAME= BLT${PORTVERSION} - -PATCH_SITES= ${MASTER_SITE_SOURCEFORGE:C/%SUBDIR%/${PORTNAME}\/BLT\/BLT%20${PORTVERSION}/} \ - ftp://ftp.csl.sony.co.jp/pub/kjc/ttt-libs/ -PATCH_SITE_SUBDIR= ${PORTNAME} -PATCHFILES= blt2.4z-patch-2 -PATCH_DIST_STRIP=-p1 +MASTER_SITES= SF/wize +DISTNAME= ${PORTNAME}-src-${PORTVERSION} MAINTAINER= ports@FreeBSD.org -COMMENT= Extension for the Tk toolkit (with shared libs) +COMMENT= Extension to the Tk toolkit + +LICENSE= BSD LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg -USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool +WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:R} -WRKSRC= ${WRKDIR}/blt2.4z +USES+= gmake tk:84,85 +USE_ZIP= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes -CFLAGS+= -Wall -Wno-uninitialized -CFLAGS+= -I${TK_INCLUDEDIR}/generic -I${TK_INCLUDEDIR}/unix - -USES+= tk:84,85 -USE_XORG= x11 - -post-patch: - ${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \ - ${REINPLACE_CMD} -e '/^INSTALL_ROOT/s|$$|$${DESTDIR}|' +CFLAGS+= -I${TCL_INCLUDEDIR}/generic +MAKE_JOBS_UNSAFE= -post-install: - ${LN} -sf libBLT24.so.3 ${STAGEDIR}${PREFIX}/lib/libBLT24.so - ${LN} -sf libBLTlite24.so.3 ${STAGEDIR}${PREFIX}/lib/libBLTlite24.so +PLIST_SUB+= BLTVER=${PORTVERSION:R} \ + BLTSHORTVER=${PORTVERSION:R:S/.//} -CONFIGURE_ARGS+=--exec_prefix=${PREFIX} \ +CONFIGURE_ARGS+=--prefix=${PREFIX} \ + --exec_prefix=${PREFIX} \ --enable-jpeg=${LOCALBASE} \ --with-tcl=${TCL_LIBDIR} \ --with-tk=${TK_LIBDIR} \ - --with-tcllibs=${LOCALBASE}/lib/ \ - --with-tklibs=${LOCALBASE}/lib/ \ - --with-tclincls=${TCL_INCLUDEDIR} \ - --with-tkincls=${TK_INCLUDEDIR} + --with-tcllibs=${LOCALBASE}/lib \ + --with-tklibs=${LOCALBASE}/lib + +post-patch: + ${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \ + ${REINPLACE_CMD} -e '/^INSTALL_ROOT/s|$$|$${DESTDIR}|' + ${FIND} ${WRKSRC}/demos -name "*.tcl" | ${XARGS} \ + ${REINPLACE_CMD} -e 's|../src/bltwish|${LOCALBASE}/bin/bltwish|' .include <bsd.port.mk> Modified: head/x11-toolkits/blt/distinfo ============================================================================== --- head/x11-toolkits/blt/distinfo Tue Nov 19 10:52:25 2013 (r334299) +++ head/x11-toolkits/blt/distinfo Tue Nov 19 11:13:47 2013 (r334300) @@ -1,4 +1,2 @@ -SHA256 (BLT2.4z.tar.gz) = 6de705eccf2ec676b4071b74ec9e211c590477fadf6f05566cfd8ed6a03c60da -SIZE (BLT2.4z.tar.gz) = 2200973 -SHA256 (blt2.4z-patch-2) = 580faabb2dab08df3c3675d3b53b9ad6bf1095f085912b4e7c2db75c5c7d669f -SIZE (blt2.4z-patch-2) = 28594 +SHA256 (blt-src-2.5.3.zip) = 6ec778f58f60f17e241156d00e7e6ca79938ff40fd61df7d23cdedfe7ec49943 +SIZE (blt-src-2.5.3.zip) = 2724036 Added: head/x11-toolkits/blt/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/blt/files/patch-configure Tue Nov 19 11:13:47 2013 (r334300) @@ -0,0 +1,134 @@ +--- configure.orig 2010-11-30 23:51:02.000000000 +0100 ++++ configure 2013-11-18 16:59:27.000000000 +0100 +@@ -975,7 +975,7 @@ + #line 976 "configure" + #include "confdefs.h" + +-main(){return(0);} ++int main(){return(0);} + EOF + if { (eval echo configure:981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes +@@ -1461,7 +1461,7 @@ + #include "confdefs.h" + + int main() { +-main() ++int main() + ; return 0; } + EOF + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +@@ -1504,7 +1504,7 @@ + #include "confdefs.h" + + int main() { +-main() ++int main() + ; return 0; } + EOF + if { (eval echo configure:1511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +@@ -1547,7 +1547,7 @@ + #include "confdefs.h" + + int main() { +-main() ++int main() + ; return 0; } + EOF + if { (eval echo configure:1554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +@@ -2325,7 +2325,7 @@ + cat > conftest.$ac_ext <<EOF + #line 2327 "configure" + #include "confdefs.h" +-main () { ++int main () { + /* Are we little or big endian? From Harbison&Steele. */ + union + { +@@ -2371,11 +2371,12 @@ + #line 2372 "configure" + #include "confdefs.h" + #include <stdio.h> +-main() ++#include <stdlib.h> ++int main() + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +- fprintf(f, "%d\n", sizeof(int)); ++ fprintf(f, "%zu\n", sizeof(int)); + exit(0); + } + EOF +@@ -2410,11 +2411,12 @@ + #line 2411 "configure" + #include "confdefs.h" + #include <stdio.h> +-main() ++#include <stdlib.h> ++int main() + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +- fprintf(f, "%d\n", sizeof(long)); ++ fprintf(f, "%zu\n", sizeof(long)); + exit(0); + } + EOF +@@ -2449,11 +2451,12 @@ + #line 2450 "configure" + #include "confdefs.h" + #include <stdio.h> +-main() ++#include <stdlib.h> ++int main() + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +- fprintf(f, "%d\n", sizeof(long long)); ++ fprintf(f, "%zu\n", sizeof(long long)); + exit(0); + } + EOF +@@ -2488,11 +2491,12 @@ + #line 2489 "configure" + #include "confdefs.h" + #include <stdio.h> +-main() ++#include <stdlib.h> ++int main() + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +- fprintf(f, "%d\n", sizeof(void *)); ++ fprintf(f, "%zu\n", sizeof(void *)); + exit(0); + } + EOF +@@ -2681,7 +2685,7 @@ + #line 2682 "configure" + #include "confdefs.h" + +-main () { ++int main () { + double e, u; + /* + * Check the smallest value such that 1.0 + x != 1.0. +@@ -3379,7 +3383,7 @@ + fi + + case $target in +- *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|OpenBSD-*|*-*-cygwin*|*-*-mingw*) ++ *-sunos4*|*-*-netbsd|NetBSD-*|*-freebsd*|OpenBSD-*|*-*-cygwin*|*-*-mingw*) + TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}" + TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}" + ;; +@@ -3854,7 +3858,7 @@ + SHLIB_SUFFIX=".so" + SHLIB_TARGET="" + SHLIB_CFLAGS="" +-SHLIB_LIB_SPECS="${JPEG_LIB_SPEC}" ++SHLIB_LIB_SPECS="${JPEG_LIB_SPEC} ${TK_LIB_SPEC} ${TCL_LIB_SPEC}" + SHLIB_TCL_ONLY_LIB_SPECS="${TCL_ONLY_LIB_SPECS}" + SHLIB_TCL_ONLY_LIB_SPECS="" + LDFLAGS="" Added: head/x11-toolkits/blt/files/patch-generic_bltBgexec.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/blt/files/patch-generic_bltBgexec.c Tue Nov 19 11:13:47 2013 (r334300) @@ -0,0 +1,11 @@ +--- generic/bltBgexec.c.orig 2013-11-18 16:52:13.000000000 +0100 ++++ generic/bltBgexec.c 2013-11-18 16:53:58.000000000 +0100 +@@ -926,7 +926,7 @@ + Tcl_DStringInit(&dStr); + GetSinkData(sinkPtr, &data, &length); + Tcl_DStringAppend(&dStr, sinkPtr->command, -1); +- Tcl_DStringAppendElement(&dStr, data); ++ Tcl_DStringAppendElement(&dStr, (const char *)data); + Tcl_DStringAppendElement(&dStr, status); + if (Tcl_GlobalEval(interp, Tcl_DStringValue(&dStr)) != TCL_OK) { + Tcl_BackgroundError(interp); Added: head/x11-toolkits/blt/files/patch-generic_bltDecls.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/blt/files/patch-generic_bltDecls.h Tue Nov 19 11:13:47 2013 (r334300) @@ -0,0 +1,38 @@ +--- generic/bltDecls.h.orig 2013-11-18 17:41:05.000000000 +0100 ++++ generic/bltDecls.h 2013-11-18 17:43:44.000000000 +0100 +@@ -532,7 +532,7 @@ + + Blt_TreeKey (*blt_TreeGetKey) _ANSI_ARGS_((CONST char * string)); /* 0 */ + Blt_TreeNode (*blt_TreeCreateNode) _ANSI_ARGS_((Blt_Tree tree, Blt_TreeNode parent, CONST char * name, int position)); /* 1 */ +- Blt_TreeNode (*blt_TreeCreateNodeWithId) _ANSI_ARGS_((Blt_Tree tree, Blt_TreeNode parent, CONST char * name, int position, int inode)); /* 2 */ ++ Blt_TreeNode (*blt_TreeCreateNodeWithId) _ANSI_ARGS_((Blt_Tree tree, Blt_TreeNode parent, CONST char * name, unsigned int position, int inode)); /* 2 */ + int (*blt_TreeDeleteNode) _ANSI_ARGS_((Blt_Tree tree, Blt_TreeNode node)); /* 3 */ + int (*blt_TreeMoveNode) _ANSI_ARGS_((Blt_Tree tree, Blt_TreeNode node, Blt_TreeNode parent, Blt_TreeNode before)); /* 4 */ + Blt_TreeNode (*blt_TreeGetNode) _ANSI_ARGS_((Blt_Tree tree, unsigned int inode)); /* 5 */ +@@ -558,7 +558,7 @@ + int (*blt_TreeSetArrayValue) _ANSI_ARGS_((Tcl_Interp * interp, Blt_Tree tree, Blt_TreeNode node, CONST char * arrayName, CONST char * elemName, Tcl_Obj * valueObjPtr)); /* 25 */ + int (*blt_TreeUnsetArrayValue) _ANSI_ARGS_((Tcl_Interp * interp, Blt_Tree tree, Blt_TreeNode node, CONST char * arrayName, CONST char * elemName)); /* 26 */ + int (*blt_TreeArrayValueExists) _ANSI_ARGS_((Blt_Tree tree, Blt_TreeNode node, CONST char * arrayName, CONST char * elemName)); /* 27 */ +- int (*blt_TreeArrayNames) _ANSI_ARGS_((Tcl_Interp * interp, Blt_Tree tree, Blt_TreeNode node, CONST char * arrayName, Tcl_Obj * listObjPtr)); /* 28 */ ++ int (*blt_TreeArrayNames) _ANSI_ARGS_((Tcl_Interp * interp, Blt_Tree tree, Blt_TreeNode node, CONST char * arrayName, Tcl_Obj * listObjPtr, const char *)); /* 28 */ + int (*blt_TreeGetValueByKey) _ANSI_ARGS_((Tcl_Interp * interp, Blt_Tree tree, Blt_TreeNode node, Blt_TreeKey key, Tcl_Obj ** valuePtr)); /* 29 */ + int (*blt_TreeSetValueByKey) _ANSI_ARGS_((Tcl_Interp * interp, Blt_Tree tree, Blt_TreeNode node, Blt_TreeKey key, Tcl_Obj * valuePtr)); /* 30 */ + int (*blt_TreeUnsetValueByKey) _ANSI_ARGS_((Tcl_Interp * interp, Blt_Tree tree, Blt_TreeNode node, Blt_TreeKey key)); /* 31 */ +@@ -578,13 +578,13 @@ + void (*blt_TreeDeleteTrace) _ANSI_ARGS_((Blt_TreeTrace token)); /* 45 */ + void (*blt_TreeCreateEventHandler) _ANSI_ARGS_((Blt_Tree tree, unsigned int mask, Blt_TreeNotifyEventProc * proc, ClientData clientData)); /* 46 */ + void (*blt_TreeDeleteEventHandler) _ANSI_ARGS_((Blt_Tree tree, unsigned int mask, Blt_TreeNotifyEventProc * proc, ClientData clientData)); /* 47 */ +- void (*blt_TreeRelabelNode) _ANSI_ARGS_((Blt_Tree tree, Blt_TreeNode node, CONST char * string)); /* 48 */ +- void (*blt_TreeRelabelNode2) _ANSI_ARGS_((Blt_TreeNode node, CONST char * string)); /* 49 */ ++ int (*blt_TreeRelabelNode) _ANSI_ARGS_((Blt_Tree tree, Blt_TreeNode node, CONST char * string)); /* 48 */ ++ int (*blt_TreeRelabelNode2) _ANSI_ARGS_((Blt_TreeNode node, CONST char * string)); /* 49 */ + char * (*blt_TreeNodePath) _ANSI_ARGS_((Blt_TreeNode node, Tcl_DString * resultPtr)); /* 50 */ + int (*blt_TreeNodePosition) _ANSI_ARGS_((Blt_TreeNode node)); /* 51 */ + void (*blt_TreeClearTags) _ANSI_ARGS_((Blt_Tree tree, Blt_TreeNode node)); /* 52 */ +- void (*blt_TreeAddTag) _ANSI_ARGS_((Blt_Tree tree, Blt_TreeNode node, CONST char * tagName)); /* 53 */ +- void (*blt_TreeForgetTag) _ANSI_ARGS_((Blt_Tree tree, CONST char * tagName)); /* 54 */ ++ int (*blt_TreeAddTag) _ANSI_ARGS_((Blt_Tree tree, Blt_TreeNode node, CONST char * tagName)); /* 53 */ ++ int (*blt_TreeForgetTag) _ANSI_ARGS_((Blt_Tree tree, CONST char * tagName)); /* 54 */ + int (*blt_TreeTagTableIsShared) _ANSI_ARGS_((Blt_Tree tree)); /* 55 */ + int (*blt_TreeShareTagTable) _ANSI_ARGS_((Blt_Tree src, Blt_Tree target)); /* 56 */ + Blt_HashEntry * (*blt_TreeFirstTag) _ANSI_ARGS_((Blt_Tree tree, Blt_HashSearch * searchPtr)); /* 57 */ Added: head/x11-toolkits/blt/files/patch-generic_bltGrAxis.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/blt/files/patch-generic_bltGrAxis.c Tue Nov 19 11:13:47 2013 (r334300) @@ -0,0 +1,49 @@ +--- generic/bltGrAxis.c.orig 2013-11-18 17:44:53.000000000 +0100 ++++ generic/bltGrAxis.c 2013-11-18 17:46:54.000000000 +0100 +@@ -3436,7 +3436,7 @@ + Graph *graphPtr; + Axis *axisPtr; + int argc; +- char *argv[]; ++ CONST char *argv[]; + { + int flags; + +@@ -3858,11 +3858,11 @@ + ConfigureVirtualOp(graphPtr, argc, argv) + Graph *graphPtr; + int argc; +- char *argv[]; ++ CONST char *argv[]; + { + Axis *axisPtr; + int nNames, nOpts; +- char **options; ++ CONST char **options; + register int i; + + /* Figure out where the option value pairs begin */ +@@ -3872,7 +3872,7 @@ + if (argv[i][0] == '-') { + break; + } +- if (NameToAxis(graphPtr, argv[i], &axisPtr) != TCL_OK) { ++ if (NameToAxis(graphPtr, (char *)argv[i], &axisPtr) != TCL_OK) { + return TCL_ERROR; + } + } +@@ -3881,10 +3881,10 @@ + options = argv + i; /* Start of options in argv */ + + for (i = 0; i < nNames; i++) { +- if (NameToAxis(graphPtr, argv[i], &axisPtr) != TCL_OK) { +- return TCL_ERROR; +- } +- if (ConfigureOp(graphPtr, axisPtr, nOpts, options) != TCL_OK) { ++ if (NameToAxis(graphPtr, (char *)argv[i], &axisPtr) != TCL_OK) { ++ return TCL_ERROR; ++ } ++ if (ConfigureOp(graphPtr, axisPtr, nOpts, options) != TCL_OK) { + break; + } + } Added: head/x11-toolkits/blt/files/patch-generic_bltGrElem.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/blt/files/patch-generic_bltGrElem.c Tue Nov 19 11:13:47 2013 (r334300) @@ -0,0 +1,53 @@ +--- generic/bltGrElem.c.orig 2013-11-18 17:47:27.000000000 +0100 ++++ generic/bltGrElem.c 2013-11-18 17:48:30.000000000 +0100 +@@ -1658,7 +1658,7 @@ + Graph *graphPtr; /* Graph widget */ + Tcl_Interp *interp; /* Interpreter to report results to */ + int argc; /* Number of element names */ +- char **argv; /* List of element names */ ++ CONST char **argv; /* List of element names */ + { + Element *elemPtr; + ClosestSearch search; +@@ -1710,7 +1710,7 @@ + if (i < argc) { + + for ( /* empty */ ; i < argc; i++) { +- if (NameToElement(graphPtr, argv[i], &elemPtr) != TCL_OK) { ++ if (NameToElement(graphPtr, (char *)argv[i], &elemPtr) != TCL_OK) { + return TCL_ERROR; /* Can't find named element */ + } + if (elemPtr->hidden) { +@@ -1811,12 +1811,12 @@ + Graph *graphPtr; + Tcl_Interp *interp; + int argc; +- char *argv[]; ++ CONST char *argv[]; + { + Element *elemPtr; + int flags; + int numNames, numOpts; +- char **options; ++ CONST char **options; + register int i; + + /* Figure out where the option value pairs begin */ +@@ -1826,7 +1826,7 @@ + if (argv[i][0] == '-') { + break; + } +- if (NameToElement(graphPtr, argv[i], &elemPtr) != TCL_OK) { ++ if (NameToElement(graphPtr, (char *)argv[i], &elemPtr) != TCL_OK) { + return TCL_ERROR; /* Can't find named element */ + } + } +@@ -1835,7 +1835,7 @@ + options = argv + numNames; /* Start of options in argv */ + + for (i = 0; i < numNames; i++) { +- NameToElement(graphPtr, argv[i], &elemPtr); ++ NameToElement(graphPtr, (char *)argv[i], &elemPtr); + flags = TK_CONFIG_ARGV_ONLY; + if (numOpts == 0) { + return Tk_ConfigureInfo(interp, graphPtr->tkwin, Added: head/x11-toolkits/blt/files/patch-generic_bltGrGrid.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/blt/files/patch-generic_bltGrGrid.c Tue Nov 19 11:13:47 2013 (r334300) @@ -0,0 +1,11 @@ +--- generic/bltGrGrid.c.orig 2013-11-18 17:49:30.000000000 +0100 ++++ generic/bltGrGrid.c 2013-11-18 17:49:49.000000000 +0100 +@@ -355,7 +355,7 @@ + Graph *graphPtr; + Tcl_Interp *interp; + int argc; +- char **argv; ++ CONST char **argv; + { + Grid *gridPtr = (Grid *)graphPtr->gridPtr; + int flags; Added: head/x11-toolkits/blt/files/patch-generic_bltGrHairs.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/blt/files/patch-generic_bltGrHairs.c Tue Nov 19 11:13:47 2013 (r334300) @@ -0,0 +1,11 @@ +--- generic/bltGrHairs.c.orig 2013-11-18 17:50:12.000000000 +0100 ++++ generic/bltGrHairs.c 2013-11-18 17:50:29.000000000 +0100 +@@ -379,7 +379,7 @@ + Graph *graphPtr; + Tcl_Interp *interp; + int argc; +- char **argv; ++ CONST char **argv; + { + Crosshairs *chPtr = graphPtr->crosshairs; + Added: head/x11-toolkits/blt/files/patch-generic_bltGrLegd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/blt/files/patch-generic_bltGrLegd.c Tue Nov 19 11:13:47 2013 (r334300) @@ -0,0 +1,11 @@ +--- generic/bltGrLegd.c.orig 2013-11-18 17:50:55.000000000 +0100 ++++ generic/bltGrLegd.c 2013-11-18 17:51:07.000000000 +0100 +@@ -1393,7 +1393,7 @@ + Graph *graphPtr; + Tcl_Interp *interp; + int argc; +- char **argv; ++ CONST char **argv; + { + int flags = TK_CONFIG_ARGV_ONLY; + Legend *legendPtr; Added: head/x11-toolkits/blt/files/patch-generic_bltGrLine.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/blt/files/patch-generic_bltGrLine.c Tue Nov 19 11:13:47 2013 (r334300) @@ -0,0 +1,11 @@ +--- generic/bltGrLine.c.orig 2013-11-18 17:51:32.000000000 +0100 ++++ generic/bltGrLine.c 2013-11-18 17:51:47.000000000 +0100 +@@ -1211,7 +1211,7 @@ + NameOfSmooth(value) + Smoothing value; + { +- if ((value < 0) || (value >= PEN_SMOOTH_LAST)) { ++ if ((value == 0) || (value >= PEN_SMOOTH_LAST)) { + return "unknown smooth value"; + } + return smoothingInfo[value].name; Added: head/x11-toolkits/blt/files/patch-generic_bltGrMarker.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/blt/files/patch-generic_bltGrMarker.c Tue Nov 19 11:13:47 2013 (r334300) @@ -0,0 +1,36 @@ +--- generic/bltGrMarker.c.orig 2013-11-18 17:52:05.000000000 +0100 ++++ generic/bltGrMarker.c 2013-11-18 17:53:22.000000000 +0100 +@@ -4274,13 +4274,13 @@ + Graph *graphPtr; + Tcl_Interp *interp; + int argc; +- char **argv; ++ CONST char **argv; + { + Marker *markerPtr; + int flags = TK_CONFIG_ARGV_ONLY; + char *oldName; + int nNames, nOpts; +- char **options; ++ CONST char **options; + register int i; + int under; + +@@ -4291,7 +4291,7 @@ + if (argv[i][0] == '-') { + break; + } +- if (NameToMarker(graphPtr, argv[i], &markerPtr) != TCL_OK) { ++ if (NameToMarker(graphPtr, (char *)argv[i], &markerPtr) != TCL_OK) { + return TCL_ERROR; + } + } +@@ -4300,7 +4300,7 @@ + options = argv + nNames; /* Start of options in argv */ + + for (i = 0; i < nNames; i++) { +- NameToMarker(graphPtr, argv[i], &markerPtr); ++ NameToMarker(graphPtr, (char *)argv[i], &markerPtr); + if (nOpts == 0) { + return Tk_ConfigureInfo(interp, graphPtr->tkwin, + markerPtr->classPtr->configSpecs, (char *)markerPtr, Added: head/x11-toolkits/blt/files/patch-generic_bltGrPen.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/blt/files/patch-generic_bltGrPen.c Tue Nov 19 11:13:47 2013 (r334300) @@ -0,0 +1,36 @@ +--- generic/bltGrPen.c.orig 2013-11-18 17:53:49.000000000 +0100 ++++ generic/bltGrPen.c 2013-11-18 17:54:24.000000000 +0100 +@@ -475,13 +475,13 @@ + Tcl_Interp *interp; + Graph *graphPtr; + int argc; +- char *argv[]; ++ CONST char *argv[]; + { + int flags; + Pen *penPtr; + int nNames, nOpts; + int redraw; +- char **options; ++ CONST char **options; + register int i; + + /* Figure out where the option value pairs begin */ +@@ -491,7 +491,7 @@ + if (argv[i][0] == '-') { + break; + } +- if (NameToPen(graphPtr, argv[i]) == NULL) { ++ if (NameToPen(graphPtr, (char *)argv[i]) == NULL) { + return TCL_ERROR; + } + } +@@ -501,7 +501,7 @@ + + redraw = 0; + for (i = 0; i < nNames; i++) { +- penPtr = NameToPen(graphPtr, argv[i]); ++ penPtr = NameToPen(graphPtr, (char *)argv[i]); + flags = TK_CONFIG_ARGV_ONLY | (penPtr->flags & (ACTIVE_PEN|NORMAL_PEN)); + if (nOpts == 0) { + return Tk_ConfigureInfo(interp, graphPtr->tkwin, Added: head/x11-toolkits/blt/files/patch-generic_bltGrPs.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/blt/files/patch-generic_bltGrPs.c Tue Nov 19 11:13:47 2013 (r334300) @@ -0,0 +1,44 @@ +--- generic/bltGrPs.c.orig 2013-11-19 09:13:57.000000000 +0100 ++++ generic/bltGrPs.c 2013-11-19 09:16:50.000000000 +0100 +@@ -406,7 +406,7 @@ + Graph *graphPtr; + Tcl_Interp *interp; + int argc; /* Number of options in argv vector */ +- char **argv; /* Option vector */ ++ CONST char **argv; /* Option vector */ + { + int flags = TK_CONFIG_ARGV_ONLY; + PostScript *psPtr = (PostScript *)graphPtr->postscript; +@@ -634,7 +634,7 @@ + static int + PostScriptPreamble(graphPtr, fileName, psToken) + Graph *graphPtr; +- char *fileName; ++ CONST char *fileName; + PsToken psToken; + { + PostScript *psPtr = (PostScript *)graphPtr->postscript; +@@ -829,7 +829,7 @@ + static int + GraphToPostScript(graphPtr, ident, psToken) + Graph *graphPtr; +- char *ident; /* Identifier string (usually the filename) */ ++ CONST char *ident; /* Identifier string (usually the filename) */ + PsToken psToken; + { + int x, y, width, height; +@@ -1110,12 +1110,12 @@ + Graph *graphPtr; /* Graph widget record */ + Tcl_Interp *interp; + int argc; /* Number of options in argv vector */ +- char **argv; /* Option vector */ ++ CONST char **argv; /* Option vector */ + { + PostScript *psPtr = (PostScript *)graphPtr->postscript; + FILE *f = NULL; + PsToken psToken; +- char *fileName; /* Name of file to write PostScript output ++ CONST char *fileName; /* Name of file to write PostScript output + * If NULL, output is returned via + * interp->result. */ + fileName = NULL; Added: head/x11-toolkits/blt/files/patch-generic_bltGraph.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/blt/files/patch-generic_bltGraph.c Tue Nov 19 11:13:47 2013 (r334300) @@ -0,0 +1,56 @@ +--- generic/bltGraph.c.orig 2013-11-19 09:17:39.000000000 +0100 ++++ generic/bltGraph.c 2013-11-19 09:20:27.000000000 +0100 +@@ -887,7 +887,7 @@ + CreateGraph(interp, argc, argv, classUid) + Tcl_Interp *interp; + int argc; +- char **argv; ++ CONST char **argv; + Blt_Uid classUid; + { + Graph *graphPtr; +@@ -1082,7 +1082,7 @@ + Graph *graphPtr; + Tcl_Interp *interp; + int argc; +- char **argv; ++ CONST char **argv; + { + int flags; + +@@ -1926,7 +1926,7 @@ + NewGraph(interp, argc, argv, classUid) + Tcl_Interp *interp; + int argc; +- char **argv; ++ CONST char **argv; + Blt_Uid classUid; + { + Graph *graphPtr; +@@ -1968,7 +1968,7 @@ + int argc; + char **argv; + { +- return NewGraph(interp, argc, argv, bltLineElementUid); ++ return NewGraph(interp, argc, (const char **)argv, bltLineElementUid); + } + + /* +@@ -1995,7 +1995,7 @@ + int argc; + char **argv; + { +- return NewGraph(interp, argc, argv, bltBarElementUid); ++ return NewGraph(interp, argc, (const char **)argv, bltBarElementUid); + } + + /* +@@ -2022,7 +2022,7 @@ + int argc; + char **argv; + { +- return NewGraph(interp, argc, argv, bltStripElementUid); ++ return NewGraph(interp, argc, (const char **)argv, bltStripElementUid); + } + + /* Added: head/x11-toolkits/blt/files/patch-generic_bltHash.h.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/blt/files/patch-generic_bltHash.h.in Tue Nov 19 11:13:47 2013 (r334300) @@ -0,0 +1,11 @@ +--- generic/bltHash.h.in.orig 2013-11-18 17:11:43.000000000 +0100 ++++ generic/bltHash.h.in 2013-11-18 17:11:53.000000000 +0100 +@@ -88,7 +88,7 @@ + * Acceptable key types for hash tables: + */ + #define BLT_STRING_KEYS 0 +-#define BLT_ONE_WORD_KEYS ((size_t)-1) ++#define BLT_ONE_WORD_KEYS (-1) + + /* + * Forward declaration of Blt_HashTable. Needed by some C++ compilers Added: head/x11-toolkits/blt/files/patch-generic_bltInit.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/blt/files/patch-generic_bltInit.c Tue Nov 19 11:13:47 2013 (r334300) @@ -0,0 +1,24 @@ +--- generic/bltInit.c.orig 2013-11-19 09:31:51.000000000 +0100 ++++ generic/bltInit.c 2013-11-19 09:31:51.000000000 +0100 +@@ -510,7 +510,6 @@ + Tcl_Interp *interp; /* Interpreter to add extra commands */ + { + int flags; +- int dostub = 0; + + flags = (int)Tcl_GetAssocData(interp, BLT_THREAD_KEY, NULL); + if ((flags & BLT_TCL_CMDS) == 0) { +@@ -562,11 +561,11 @@ + Blt_RegisterArrayObj(interp); + bltNaN = MakeNaN(); + #ifdef USE_BLT_STUBS +- if (Tcl_PkgProvideEx(interp, "BLT", BLT_PATCH_LEVEL, &bltStubs) != TCL_OK) { ++ if (Tcl_PkgProvideEx(interp, "BLT", BLT_VERSION, &bltStubs) != TCL_OK) { + return TCL_ERROR; + } + #else +- if (Tcl_PkgProvideEx(interp, "BLT", BLT_PATCH_LEVEL, NULL) != TCL_OK) { ++ if (Tcl_PkgProvideEx(interp, "BLT", BLT_VERSION, NULL) != TCL_OK) { + return TCL_ERROR; + } + #endif Added: head/x11-toolkits/blt/files/patch-generic_bltInt.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/blt/files/patch-generic_bltInt.h Tue Nov 19 11:13:47 2013 (r334300) @@ -0,0 +1,20 @@ +--- generic/bltInt.h.orig 2010-12-10 23:41:18.000000000 +0100 ++++ generic/bltInt.h 2013-11-19 09:15:34.000000000 +0100 +@@ -275,7 +275,7 @@ + + #define free(x) abc123(x) + +-extern int Blt_DictionaryCompare _ANSI_ARGS_((char *s1, char *s2)); ++extern int Blt_DictionaryCompare _ANSI_ARGS_((CONST char *s1, CONST char *s2)); + + EXTERN void Blt_Panic _ANSI_ARGS_(TCL_VARARGS(char *, args)); + +@@ -379,7 +379,7 @@ + + #ifdef TCL_UTF_MAX + #define HAVE_UTF 1 +-extern FILE *Blt_OpenUtfFile _ANSI_ARGS_((char *fileName, char *mode)); ++extern FILE *Blt_OpenUtfFile _ANSI_ARGS_((CONST char *fileName, char *mode)); + #define fopen(f,m) Blt_OpenUtfFile((f),(m)); + #else + #define HAVE_UTF 0 Added: head/x11-toolkits/blt/files/patch-generic_bltNsUtil.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/blt/files/patch-generic_bltNsUtil.c Tue Nov 19 11:13:47 2013 (r334300) @@ -0,0 +1,28 @@ +--- generic/bltNsUtil.c.orig 2013-11-18 17:04:03.000000000 +0100 ++++ generic/bltNsUtil.c 2013-11-18 17:11:18.000000000 +0100 +@@ -27,6 +27,7 @@ + + #include "bltInt.h" + #include "bltList.h" ++#include <tclInt.h> + + /* Namespace related routines */ + +@@ -62,7 +63,7 @@ + Tcl_Var varPtr; + Tcl_Namespace *nsPtr; + Tcl_Obj *objPtr; +- char *str, *cp; ++ const char *str, *cp; + + varPtr = Tcl_FindNamespaceVar(interp, (char *)name, + (Tcl_Namespace *)NULL, 0); +@@ -72,7 +73,7 @@ + objPtr = Tcl_NewObj(); + Tcl_GetVariableFullName(interp, varPtr, objPtr); + str = Tcl_GetString(objPtr); +- if (Blt_ParseQualifiedName(interp, str, &nsPtr, &cp) == NULL) { ++ if (Blt_ParseQualifiedName(interp, str, &nsPtr, &cp) != TCL_OK) { + nsPtr = NULL; + } + Tcl_DecrRefCount(objPtr); Added: head/x11-toolkits/blt/files/patch-generic_bltScrollbar.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/blt/files/patch-generic_bltScrollbar.c Tue Nov 19 11:13:47 2013 (r334300) @@ -0,0 +1,11 @@ +--- generic/bltScrollbar.c.orig 2013-10-30 11:57:57.000000000 +0100 ++++ generic/bltScrollbar.c 2013-10-30 11:59:06.000000000 +0100 +@@ -588,7 +588,7 @@ + } else { + fraction = ((double)pixels / (double)barWidth); + } +- sprintf(interp->result, "%g", fraction); ++ Tcl_SetObjResult(interp, Tcl_NewDoubleObj(fraction)); + } else if ((c == 'f') && (strncmp(argv[1], "fraction", length) == 0)) { + int x, y, pos, barWidth; + double fraction; Added: head/x11-toolkits/blt/files/patch-generic_bltSwitch.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/blt/files/patch-generic_bltSwitch.c Tue Nov 19 11:13:47 2013 (r334300) @@ -0,0 +1,11 @@ +--- generic/bltSwitch.c.orig 2013-11-18 17:14:04.000000000 +0100 ++++ generic/bltSwitch.c 2013-11-18 17:14:37.000000000 +0100 +@@ -111,7 +111,7 @@ + if (specPtr->switchName == NULL) { + continue; + } +- if (name[1] != '?' || specPtr->type < 0 || specPtr->type >= BLT_SWITCH_END) { ++ if (name[1] != '?' || specPtr->type == 0 || specPtr->type >= BLT_SWITCH_END) { + Tcl_AppendResult(interp, specPtr->switchName, " ", 0); + } else { + static char *typenames[BLT_SWITCH_END+10] = { Added: head/x11-toolkits/blt/files/patch-generic_bltTabset.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/blt/files/patch-generic_bltTabset.c Tue Nov 19 11:13:47 2013 (r334300) @@ -0,0 +1,38 @@ +--- generic/bltTabset.c.orig 2013-11-19 09:28:40.000000000 +0100 ++++ generic/bltTabset.c 2013-11-19 09:30:50.000000000 +0100 +@@ -2093,7 +2093,7 @@ + return TCL_OK; + } + Tcl_ResetResult(setPtr->interp); +- if (GetTabByIndex(setPtr, string, tabPtrPtr) != TCL_OK) { ++ if (GetTabByIndex(setPtr, string, tabPtrPtr, INVALID_OK) != TCL_OK) { + return TCL_ERROR; /* Can't find node. */ + } + return TCL_OK; +@@ -2105,7 +2105,7 @@ + char *string, + Tab **tabPtrPtr) + { +- if (GetTabByIndex(setPtr, string, tabPtrPtr) == TCL_OK) { ++ if (GetTabByIndex(setPtr, string, tabPtrPtr, INVALID_OK) == TCL_OK) { + return TCL_OK; + } + Tcl_ResetResult(setPtr->interp); +@@ -3690,7 +3690,7 @@ + result = TCL_ERROR; + goto finish; + } +- tabPtr = CreateTab(setPtr, tName, &dStr); ++ tabPtr = CreateTab(setPtr, tName); + if (tabPtr == NULL) { + result = TCL_ERROR; + goto finish; +@@ -4049,7 +4049,7 @@ + return TCL_ERROR; + } + Tcl_DecrRefCount(objPtr); +- if (argc>3 && GetTabByIndex(setPtr, argv[3], &tabPtr) != TCL_OK) { ++ if (argc>3 && GetTabByIndex(setPtr, argv[3], &tabPtr, INVALID_OK) != TCL_OK) { + return TCL_ERROR; /* Can't find node. */ + } + if (tabPtr == NULL && optInd != OP_STARTIMAGE && optInd != OP_STARTIMAGE) { Added: head/x11-toolkits/blt/files/patch-generic_bltTed.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/blt/files/patch-generic_bltTed.c Tue Nov 19 11:13:47 2013 (r334300) @@ -0,0 +1,29 @@ +--- generic/bltTed.c.orig 2013-10-30 11:55:26.000000000 +0100 ++++ generic/bltTed.c 2013-10-30 11:57:39.000000000 +0100 +@@ -1504,7 +1504,7 @@ + tablePtr->flags |= ARRANGE_PENDING; + Tcl_DoWhenIdle(tablePtr->arrangeProc, tablePtr); + } +- interp->result = Tk_PathName(tedPtr->tkwin); ++ Tcl_SetObjResult(interp, Tcl_NewStringObj(Tk_PathName(tedPtr->tkwin), -1)); + tedPtr->flags |= LAYOUT_PENDING; + EventuallyRedraw(tedPtr); + return TCL_OK; +@@ -1678,7 +1678,7 @@ + tedPtr->activeRectArr[4].width = grip - 1; + tedPtr->activeRectArr[4].height = grip - 1; + +- interp->result = Tk_PathName(entryPtr->tkwin); ++ Tcl_SetObjResult(interp, Tcl_NewStringObj(Tk_PathName(entryPtr->tkwin), -1)); + active = 1; + break; + } +@@ -1751,7 +1751,7 @@ + tablePtr->flags |= ARRANGE_PENDING; + Tcl_DoWhenIdle(tablePtr->arrangeProc, tablePtr); + } +- interp->result = Tk_PathName(tedPtr->tkwin); ++ Tcl_SetObjResult(interp, Tcl_NewStringObj(Tk_PathName(tedPtr->tkwin), -1)); + tedPtr->flags |= LAYOUT_PENDING; + EventuallyRedraw(tedPtr); + return TCL_OK; Added: head/x11-toolkits/blt/files/patch-generic_bltTree.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/blt/files/patch-generic_bltTree.c Tue Nov 19 11:13:47 2013 (r334300) @@ -0,0 +1,42 @@ +--- generic/bltTree.c.orig 2013-11-18 17:18:20.000000000 +0100 ++++ generic/bltTree.c 2013-11-18 17:23:01.000000000 +0100 +@@ -2631,8 +2631,8 @@ + char * + Blt_TreeNodePath(Node *nodePtr, Tcl_DString *resultPtr) + { +- char **nameArr; /* Used to stack the component names. */ +- char *staticSpace[64]; ++ CONST char **nameArr; /* Used to stack the component names. */ ++ CONST char *staticSpace[64]; + int nLevels; + register int i; + +@@ -2663,8 +2663,8 @@ + char * + Blt_TreeNodePathStr(Node *nodePtr, Tcl_DString *resultPtr, char *prefix, char *delim) + { +- char **nameArr; /* Used to stack the component names. */ +- char *staticSpace[64]; ++ CONST char **nameArr; /* Used to stack the component names. */ ++ CONST char *staticSpace[64]; + int nLevels; + register int i; + +@@ -3083,7 +3083,7 @@ + Blt_HashTable *tablePtr; + Tcl_Obj *objPtr; + Value *valuePtr; +- char *key; ++ CONST char *key; + + key = Blt_TreeKeyGet(interp, clientPtr->treeObject,arrayName); + valuePtr = GetTreeValue(interp, clientPtr, nodePtr, key); +@@ -3143,7 +3143,7 @@ + Blt_HashTable *tablePtr; + Tcl_Obj *objPtr; + Value *valuePtr; +- char *key; ++ CONST char *key; + + key = Blt_TreeKeyGet(interp, clientPtr->treeObject,arrayName); + if ( bltTreeGetValueByKey(interp, clientPtr, nodePtr, key, &valuePtr) != TCL_OK) { Added: head/x11-toolkits/blt/files/patch-generic_bltTree.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/blt/files/patch-generic_bltTree.h Tue Nov 19 11:13:47 2013 (r334300) @@ -0,0 +1,11 @@ +--- generic/bltTree.h.orig 2013-11-18 17:19:46.000000000 +0100 ++++ generic/bltTree.h 2013-11-18 17:23:01.000000000 +0100 +@@ -40,7 +40,7 @@ + typedef struct Blt_TreeTagEntryStruct Blt_TreeTagEntry; + typedef struct Blt_TreeTagTableStruct Blt_TreeTagTable; + +-typedef char *Blt_TreeKey; ++typedef CONST char *Blt_TreeKey; + + /* FindData->order flags. */ + #define TREE_PREORDER (1<<0) Added: head/x11-toolkits/blt/files/patch-generic_bltTreeCmd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/blt/files/patch-generic_bltTreeCmd.c Tue Nov 19 11:13:47 2013 (r334300) @@ -0,0 +1,150 @@ +--- generic/bltTreeCmd.c.orig 2010-12-26 22:03:13.000000000 +0100 ++++ generic/bltTreeCmd.c 2013-11-18 17:38:10.000000000 +0100 +@@ -1544,8 +1544,8 @@ + Tcl_DString *resultPtr, + int lastOnly) + { +- char **nameArr; /* Used to stack the component names. */ +- char *staticSpace[64]; ++ CONST char **nameArr; /* Used to stack the component names. */ ++ CONST char *staticSpace[64]; + register int i; + int nLevels; + +@@ -2189,11 +2189,11 @@ + } + + static int +-ComparePatternList(Blt_List patternList, char *string, int nocase) ++ComparePatternList(Blt_List patternList, CONST char *string, int nocase) + { + Blt_ListNode node; + int result, type; +- char *pattern; ++ char *pattern, *s; + + result = FALSE; + for (node = Blt_ListFirstNode(patternList); node != NULL; +@@ -2217,12 +2217,14 @@ + + case PATTERN_REGEXP: + if (nocase) { +- string = Blt_Strdup(string); +- strtolower(string); ++ s = Blt_Strdup(string); ++ strtolower(s); ++ } else { ++ s = (char *)string; + } +- result = (Tcl_RegExpMatch((Tcl_Interp *)NULL, string, pattern) == 1); ++ result = (Tcl_RegExpMatch((Tcl_Interp *)NULL, s, pattern) == 1); + if (nocase) { +- Blt_Free(string); ++ Blt_Free(s); + } + break; + } +@@ -2231,10 +2233,10 @@ + } + + static int +-ComparePattern(FindData *findData, char *string) ++ComparePattern(FindData *findData, CONST char *string) + { + int result, type, nocase; +- char *pattern; ++ char *pattern, *s; + int objc, i; + Tcl_Obj **objv, *obj; + +@@ -2258,14 +2260,16 @@ + + case PATTERN_REGEXP: + if (nocase) { +- string = Blt_Strdup(string); +- strtolower(string); ++ s = Blt_Strdup(string); ++ strtolower(s); ++ } else { ++ s = (char *)string; + } +- obj = Tcl_NewStringObj(string, -1); ++ obj = Tcl_NewStringObj(s, -1); + result = (Tcl_RegExpMatchObj((Tcl_Interp *)NULL, obj, findData->name) == 1); + Tcl_DecrRefCount(obj); + if (nocase) { +- Blt_Free(string); ++ Blt_Free(s); + } + break; + case PATTERN_INLIST: +@@ -2316,7 +2320,7 @@ + /* Append the widget name and the node .t 0 */ + for (last = p = command; *p != '\0'; p++) { + if (*p == '%') { +- char *string; ++ CONST char *string; + char buf[3]; + + if (p > last) { +@@ -2454,7 +2458,7 @@ + int result, invert, cntf; + unsigned int inode; + int strict, isnull; +- char *curValue = NULL; ++ CONST char *curValue = NULL; + Tcl_Obj *curObj = NULL, *resObjPtr = NULL; + + isnull = ((dataPtr->flags&MATCH_ISNULL) != 0); +@@ -2532,7 +2536,7 @@ + key != NULL; key = Blt_TreeNextKey(cmdPtr->tree, &cursor)) { + + curObj = NULL; +- result = ComparePatternList(dataPtr->keyList, key, 0); ++ result = ComparePatternList(dataPtr->keyList, (char *)key, 0); + if (!result) { + continue; + } +@@ -2771,7 +2775,7 @@ + break; + } + } else if (dataPtr->patternList != NULL) { +- char *string; ++ CONST char *string; + + if (dataPtr->flags & MATCH_PATHNAME) { + string = GetNodePath(cmdPtr, Blt_TreeRootNode(cmdPtr->tree), *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311191113.rAJBDmJX072854>