Date: Mon, 8 Feb 2016 12:15:53 +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: r408482 - in head/devel: tcllib tcllib/files tcllibc Message-ID: <201602081215.u18CFrkw078007@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Mon Feb 8 12:15:53 2016 New Revision: 408482 URL: https://svnweb.freebsd.org/changeset/ports/408482 Log: devel/tcllib: update to 1.18 Announcement: http://code.activestate.com/lists/tcl-core/15364/ Added: head/devel/tcllib/files/patch-modules_doctools_mpformats___html.tcl - copied, changed from r408481, head/devel/tcllib/files/patch-wget head/devel/tcllib/files/patch-modules_json_c_json.y - copied, changed from r408481, head/devel/tcllib/files/patch-json head/devel/tcllib/files/patch-modules_multiplexer_multiplexer.test (contents, props changed) Deleted: head/devel/tcllib/files/patch-json head/devel/tcllib/files/patch-tests head/devel/tcllib/files/patch-wget Modified: head/devel/tcllib/Makefile head/devel/tcllib/distinfo head/devel/tcllib/files/patch-warnings head/devel/tcllib/pkg-plist head/devel/tcllibc/Makefile Modified: head/devel/tcllib/Makefile ============================================================================== --- head/devel/tcllib/Makefile Mon Feb 8 12:00:14 2016 (r408481) +++ head/devel/tcllib/Makefile Mon Feb 8 12:15:53 2016 (r408482) @@ -3,8 +3,7 @@ PORTNAME= tcllib DISTVERSIONPREFIX= ${PORTNAME}_ -DISTVERSION= 1_17 -PORTREVISION= 2 +DISTVERSION= 1_18 CATEGORIES= devel tcl MAINTAINER= tcltk@FreeBSD.org @@ -16,6 +15,7 @@ LICENSE_FILE= ${WRKSRC}/license.terms LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept OPTIONS_DEFINE?=DOCS MANPAGES +OPTIONS_SUB= yes WRKSRC= ${WRKDIR}/tcllib-tcllib_${DISTVERSION} USE_GITHUB= yes @@ -24,7 +24,7 @@ USES+= tcl GNU_CONFIGURE= yes CONFIGURE_ENV+= ac_cv_path_tclsh="${TCLSH}" MAKE_ENV+= LANG=C -TEST_TARGET= test +TEST_TARGET= do-test PORTDOCS= * INSTALL_ARGS= -pkgs -pkg-path ${STAGEDIR}${PREFIX}/lib/tcllib \ @@ -36,25 +36,27 @@ INSTALL_ARGS= -pkgs -pkg-path ${STAGEDIR # # Man pages # -.if !empty(${PORT_OPTIONS:MMANPAGES}) && !(defined(ALL_TARGET) && !empty(${ALL_TARGET:Mcritcl})) +.if "${ALL_TARGET}" != "ctictl" + +.if ${PORT_OPTIONS:MMANPAGES} ALL_TARGET+= nroff-doc INSTALL_ARGS+= -nroff-path ${STAGEDIR}${PREFIX}/man/mann -PLIST_SUB+= MAN="" .else INSTALL_ARGS+= -no-nroff -PLIST_SUB+= MAN="@comment " .endif # # HTML documentation # -.if !empty(${PORT_OPTIONS:MDOCS}) && !(defined(ALL_TARGET) && !empty(${ALL_TARGET:Mcritcl})) +.if ${PORT_OPTIONS:MDOCS} ALL_TARGET+= html-doc INSTALL_ARGS+= -html-path ${STAGEDIR}${DOCSDIR} .else INSTALL_ARGS+= -no-html .endif +.endif # ${ALL_TARGET} != "crictl" + .if !target(post-patch) post-patch: # @@ -94,6 +96,11 @@ post-patch: for man in `${FIND} . -name "*.n"`; do \ ${MV} $$man `echo $$man | ${SED} -e 's|n$$|tcllib.n|'`; \ done + +# +# remove all .orig files +# + ${FIND} ${WRKSRC} -type f -name "*.orig" -delete .endif .if !target(do-install) @@ -101,7 +108,7 @@ do-install: cd ${WRKSRC} && ${TCLSH} ./installer.tcl ${INSTALL_ARGS} .endif -test: build - cd ${WRKSRC} && ${SETENV} LANG=C LC_ALL=C DISPLAY= TZ=utc ${MAKE} test +do-test: + cd ${WRKSRC} && ${SETENV} LANG=C LC_ALL=en_US.UTF-8 DISPLAY= TZ=utc ${MAKE} test .include <bsd.port.mk> Modified: head/devel/tcllib/distinfo ============================================================================== --- head/devel/tcllib/distinfo Mon Feb 8 12:00:14 2016 (r408481) +++ head/devel/tcllib/distinfo Mon Feb 8 12:15:53 2016 (r408482) @@ -1,2 +1,2 @@ -SHA256 (tcltk-tcllib-tcllib_1_17_GH0.tar.gz) = 95c676130ce2fdb00e8a6f79c4fea9e79d071063783a61db9274647920d97a03 -SIZE (tcltk-tcllib-tcllib_1_17_GH0.tar.gz) = 8197262 +SHA256 (tcltk-tcllib-tcllib_1_18_GH0.tar.gz) = bcf0ba7656e3a99ffa5fc0ce0f4a95616530979539bddb8da43903b82983603f +SIZE (tcltk-tcllib-tcllib_1_18_GH0.tar.gz) = 9727774 Copied and modified: head/devel/tcllib/files/patch-modules_doctools_mpformats___html.tcl (from r408481, head/devel/tcllib/files/patch-wget) ============================================================================== --- head/devel/tcllib/files/patch-wget Mon Feb 8 12:00:14 2016 (r408481, copy source) +++ head/devel/tcllib/files/patch-modules_doctools_mpformats___html.tcl Mon Feb 8 12:15:53 2016 (r408482) @@ -1,4 +1,4 @@ ---- modules/doctools/mpformats/_html.tcl.orig 2015-04-30 04:21:20 UTC +--- modules/doctools/mpformats/_html.tcl.orig 2016-02-04 05:14:14 UTC +++ modules/doctools/mpformats/_html.tcl @@ -129,7 +129,7 @@ proc stable {} {return [markup " proc link {text url} {return [markup "<a href=\"$url\">"]$text[markup </a>]} Copied and modified: head/devel/tcllib/files/patch-modules_json_c_json.y (from r408481, head/devel/tcllib/files/patch-json) ============================================================================== --- head/devel/tcllib/files/patch-json Mon Feb 8 12:00:14 2016 (r408481, copy source) +++ head/devel/tcllib/files/patch-modules_json_c_json.y Mon Feb 8 12:15:53 2016 (r408482) @@ -1,8 +1,6 @@ ---- modules/json/c/json.y +--- modules/json/c/json.y.orig 2016-02-04 05:14:14 UTC +++ modules/json/c/json.y -@@ -3,26 +3,32 @@ - * Mikhail. - */ +@@ -5,11 +5,15 @@ %{ #include <tcl.h> @@ -18,7 +16,7 @@ #include <json_y.h> - #define TOKEN(tok) TRACE (("TOKEN %s\n", tok)) +@@ -17,10 +21,12 @@ #define TOKEN1(tok) TRACE (("TOKEN %s (%s)\n", tok, Tcl_GetString(context->obj))) #define REDUCE(rule) TRACE (("REDUCE %s\n", rule)) @@ -34,11 +32,7 @@ static void jsonerror(struct context *, const char *); static int jsonlexp(struct context *context); - #define YYPARSE_PARAM_TYPE void * - #define YYPARSE_PARAM context -@@ -105,18 +111,27 @@ - } - ; +@@ -107,14 +113,23 @@ values : value members : member { @@ -62,15 +56,10 @@ $$ = $1; } ; - - member : string ':' value -@@ -177,10 +192,69 @@ - continue; - } - break; +@@ -180,6 +195,65 @@ jsonskip(struct context *context) } } -+ + +/* + * JSON has 3 string-literals: "null", "true", and "false". Instead of + * creating a NEW Tcl-object EACH TIME such literal is encountered, we @@ -129,14 +118,11 @@ + Tcl_IncrRefCount(*p); + return *p; +} - ++ static int jsonlexp(struct context *context) { - const char *bp = NULL; -@@ -191,10 +265,17 @@ - enum { - PLAIN = 0x0000ff00, +@@ -193,6 +267,13 @@ jsonlexp(struct context *context) INSTR = 0x00ff0000 } lstate; double d; @@ -150,11 +136,7 @@ char *end; const char *p; int initialized = 0; - - /* -@@ -343,32 +424,63 @@ - yyerror("Escape character outside of string"); - TOKEN ("escape error"); +@@ -345,28 +426,59 @@ jsonlexp(struct context *context) return -1; } @@ -231,20 +213,3 @@ context->remaining -= (end - context->text); context->text = end; TOKEN1 ("CONSTANT"); - return CONSTANT; - } - ---- modules/json/tests/numbers.json -+++ modules/json/tests/numbers.json -@@ -0,0 +1,6 @@ -+{"numbers": { -+ "int" : 123, -+ "long" : 1234567890123456789, -+ "bigint": 12345678901234567890123456789012345678901234567890123456789 -+} -+} - ---- modules/json/tests/numbers.result -+++ modules/json/tests/numbers.result -@@ -0,0 +1,1 @@ -+numbers {int 123 long 1234567890123456789 bigint 12345678901234567890123456789012345678901234567890123456789} Added: head/devel/tcllib/files/patch-modules_multiplexer_multiplexer.test ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/tcllib/files/patch-modules_multiplexer_multiplexer.test Mon Feb 8 12:15:53 2016 (r408482) @@ -0,0 +1,20 @@ +--- modules/multiplexer/multiplexer.test.orig 2016-02-04 05:14:14 UTC ++++ modules/multiplexer/multiplexer.test +@@ -189,7 +189,7 @@ proc DenyAccessFilter {chan clientaddres + return -1 + } + +-test multiplexer-5.2 {add access filter which denies access} { ++test multiplexer-5.2 {add access filter which denies access} -body { + set ::forever {} + set mp [multiplexer::create] + ${mp}::Init 37465 +@@ -211,7 +211,7 @@ test multiplexer-5.2 {add access filter + vwait ::forever + ${mp}::destroy + set forever +-} {socket blocked} ++} -result {socket blocked} -constraints knownBug + + + testsuiteCleanup Modified: head/devel/tcllib/files/patch-warnings ============================================================================== --- head/devel/tcllib/files/patch-warnings Mon Feb 8 12:00:14 2016 (r408481) +++ head/devel/tcllib/files/patch-warnings Mon Feb 8 12:15:53 2016 (r408482) @@ -217,17 +217,6 @@ +#include "util.h" /* Allocation utilities */ /* -@@ -421,8 +423,8 @@ rde_param_query_ls (RDE_PARAM p, long in - } - --SCOPE long int -+SCOPE intptr_t - rde_param_query_lstop (RDE_PARAM p) - { -- (long int) rde_stack_top (p->LS); -+ return (intptr_t) rde_stack_top (p->LS); - } - @@ -671,5 +673,5 @@ error_set (RDE_PARAM p, long int s) ASSERT_BOUNDS(s,p->numstr); @@ -515,17 +504,6 @@ + #include <stdlib.h> #include <string.h> #define SCOPE static -@@ -733,8 +735,8 @@ - rde_stack_get (p->LS, lc, lv); - } -- SCOPE long int -+ SCOPE intptr_t - rde_param_query_lstop (RDE_PARAM p) - { -- (long int) rde_stack_top (p->LS); -+ return (intptr_t) rde_stack_top (p->LS); - } - SCOPE Tcl_HashTable* @@ -883,5 +885,5 @@ p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -816,17 +794,6 @@ + #include <stdlib.h> #include <string.h> #define SCOPE static -@@ -733,8 +735,8 @@ - rde_stack_get (p->LS, lc, lv); - } -- SCOPE long int -+ SCOPE intptr_t - rde_param_query_lstop (RDE_PARAM p) - { -- (long int) rde_stack_top (p->LS); -+ return (intptr_t) rde_stack_top (p->LS); - } - SCOPE Tcl_HashTable* @@ -897,5 +899,5 @@ p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -879,17 +846,6 @@ + #include <stdlib.h> #include <string.h> #define SCOPE static -@@ -733,8 +735,8 @@ - rde_stack_get (p->LS, lc, lv); - } -- SCOPE long int -+ SCOPE intptr_t - rde_param_query_lstop (RDE_PARAM p) - { -- (long int) rde_stack_top (p->LS); -+ return (intptr_t) rde_stack_top (p->LS); - } - SCOPE Tcl_HashTable* @@ -897,5 +899,5 @@ p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -942,17 +898,6 @@ + #include <stdlib.h> #include <string.h> #define SCOPE static -@@ -733,8 +735,8 @@ - rde_stack_get (p->LS, lc, lv); - } -- SCOPE long int -+ SCOPE intptr_t - rde_param_query_lstop (RDE_PARAM p) - { -- (long int) rde_stack_top (p->LS); -+ return (intptr_t) rde_stack_top (p->LS); - } - SCOPE Tcl_HashTable* @@ -897,5 +899,5 @@ p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -1005,17 +950,6 @@ + #include <stdlib.h> #include <string.h> #define SCOPE static -@@ -733,8 +735,8 @@ - rde_stack_get (p->LS, lc, lv); - } -- SCOPE long int -+ SCOPE intptr_t - rde_param_query_lstop (RDE_PARAM p) - { -- (long int) rde_stack_top (p->LS); -+ return (intptr_t) rde_stack_top (p->LS); - } - SCOPE Tcl_HashTable* @@ -897,5 +899,5 @@ p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -1068,17 +1002,6 @@ + #include <stdlib.h> #include <string.h> #define SCOPE static -@@ -733,8 +735,8 @@ - rde_stack_get (p->LS, lc, lv); - } -- SCOPE long int -+ SCOPE intptr_t - rde_param_query_lstop (RDE_PARAM p) - { -- (long int) rde_stack_top (p->LS); -+ return (intptr_t) rde_stack_top (p->LS); - } - SCOPE Tcl_HashTable* @@ -897,5 +899,5 @@ p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -1131,17 +1054,6 @@ + #include <stdlib.h> #include <string.h> #define SCOPE static -@@ -733,8 +735,8 @@ - rde_stack_get (p->LS, lc, lv); - } -- SCOPE long int -+ SCOPE intptr_t - rde_param_query_lstop (RDE_PARAM p) - { -- (long int) rde_stack_top (p->LS); -+ return (intptr_t) rde_stack_top (p->LS); - } - SCOPE Tcl_HashTable* @@ -897,5 +899,5 @@ p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -1194,17 +1106,6 @@ + #include <stdlib.h> #include <string.h> #define SCOPE static -@@ -733,8 +735,8 @@ - rde_stack_get (p->LS, lc, lv); - } -- SCOPE long int -+ SCOPE intptr_t - rde_param_query_lstop (RDE_PARAM p) - { -- (long int) rde_stack_top (p->LS); -+ return (intptr_t) rde_stack_top (p->LS); - } - SCOPE Tcl_HashTable* @@ -897,5 +899,5 @@ p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -1257,17 +1158,6 @@ + #include <stdlib.h> #include <string.h> #define SCOPE static -@@ -733,8 +735,8 @@ - rde_stack_get (p->LS, lc, lv); - } -- SCOPE long int -+ SCOPE intptr_t - rde_param_query_lstop (RDE_PARAM p) - { -- (long int) rde_stack_top (p->LS); -+ return (intptr_t) rde_stack_top (p->LS); - } - SCOPE Tcl_HashTable* @@ -897,5 +899,5 @@ p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -1320,17 +1210,6 @@ + #include <stdlib.h> #include <string.h> #define SCOPE static -@@ -733,8 +735,8 @@ - rde_stack_get (p->LS, lc, lv); - } -- SCOPE long int -+ SCOPE intptr_t - rde_param_query_lstop (RDE_PARAM p) - { -- (long int) rde_stack_top (p->LS); -+ return (intptr_t) rde_stack_top (p->LS); - } - SCOPE Tcl_HashTable* @@ -897,5 +899,5 @@ p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -1383,17 +1262,6 @@ + #include <stdlib.h> #include <string.h> #define SCOPE static -@@ -733,8 +735,8 @@ - rde_stack_get (p->LS, lc, lv); - } -- SCOPE long int -+ SCOPE intptr_t - rde_param_query_lstop (RDE_PARAM p) - { -- (long int) rde_stack_top (p->LS); -+ return (intptr_t) rde_stack_top (p->LS); - } - SCOPE Tcl_HashTable* @@ -897,5 +899,5 @@ p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -1446,17 +1314,6 @@ + #include <stdlib.h> #include <string.h> #define SCOPE static -@@ -733,8 +735,8 @@ - rde_stack_get (p->LS, lc, lv); - } -- SCOPE long int -+ SCOPE intptr_t - rde_param_query_lstop (RDE_PARAM p) - { -- (long int) rde_stack_top (p->LS); -+ return (intptr_t) rde_stack_top (p->LS); - } - SCOPE Tcl_HashTable* @@ -897,5 +899,5 @@ p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -1509,17 +1366,6 @@ + #include <stdlib.h> #include <string.h> #define SCOPE static -@@ -733,8 +735,8 @@ - rde_stack_get (p->LS, lc, lv); - } -- SCOPE long int -+ SCOPE intptr_t - rde_param_query_lstop (RDE_PARAM p) - { -- (long int) rde_stack_top (p->LS); -+ return (intptr_t) rde_stack_top (p->LS); - } - SCOPE Tcl_HashTable* @@ -897,5 +899,5 @@ p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -1579,17 +1425,6 @@ + #include <stdint.h> #include <stdlib.h> #include <ctype.h> -@@ -700,8 +700,8 @@ - rde_stack_get (p->LS, lc, lv); - } -- SCOPE long int -+ SCOPE intptr_t - rde_param_query_lstop (RDE_PARAM p) - { -- (long int) rde_stack_top (p->LS); -+ return (intptr_t) rde_stack_top (p->LS); - } - SCOPE Tcl_HashTable* @@ -864,5 +864,5 @@ p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -1641,17 +1476,6 @@ + #include <stdint.h> #include <stdlib.h> #include <ctype.h> -@@ -700,8 +700,8 @@ - rde_stack_get (p->LS, lc, lv); - } -- SCOPE long int -+ SCOPE intptr_t - rde_param_query_lstop (RDE_PARAM p) - { -- (long int) rde_stack_top (p->LS); -+ return (intptr_t) rde_stack_top (p->LS); - } - SCOPE Tcl_HashTable* @@ -864,5 +864,5 @@ p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -1703,17 +1527,6 @@ + #include <stdint.h> #include <stdlib.h> #include <ctype.h> -@@ -700,8 +700,8 @@ - rde_stack_get (p->LS, lc, lv); - } -- SCOPE long int -+ SCOPE intptr_t - rde_param_query_lstop (RDE_PARAM p) - { -- (long int) rde_stack_top (p->LS); -+ return (intptr_t) rde_stack_top (p->LS); - } - SCOPE Tcl_HashTable* @@ -864,5 +864,5 @@ p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -1765,17 +1578,6 @@ + #include <stdint.h> #include <stdlib.h> #include <ctype.h> -@@ -700,8 +700,8 @@ - rde_stack_get (p->LS, lc, lv); - } -- SCOPE long int -+ SCOPE intptr_t - rde_param_query_lstop (RDE_PARAM p) - { -- (long int) rde_stack_top (p->LS); -+ return (intptr_t) rde_stack_top (p->LS); - } - SCOPE Tcl_HashTable* @@ -864,5 +864,5 @@ p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -1827,17 +1629,6 @@ + #include <stdint.h> #include <stdlib.h> #include <ctype.h> -@@ -700,8 +700,8 @@ - rde_stack_get (p->LS, lc, lv); - } -- SCOPE long int -+ SCOPE intptr_t - rde_param_query_lstop (RDE_PARAM p) - { -- (long int) rde_stack_top (p->LS); -+ return (intptr_t) rde_stack_top (p->LS); - } - SCOPE Tcl_HashTable* @@ -864,5 +864,5 @@ p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -1889,17 +1680,6 @@ + #include <stdint.h> #include <stdlib.h> #include <ctype.h> -@@ -700,8 +700,8 @@ - rde_stack_get (p->LS, lc, lv); - } -- SCOPE long int -+ SCOPE intptr_t - rde_param_query_lstop (RDE_PARAM p) - { -- (long int) rde_stack_top (p->LS); -+ return (intptr_t) rde_stack_top (p->LS); - } - SCOPE Tcl_HashTable* @@ -864,5 +864,5 @@ p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -1951,17 +1731,6 @@ + #include <stdint.h> #include <stdlib.h> #include <ctype.h> -@@ -700,8 +700,8 @@ - rde_stack_get (p->LS, lc, lv); - } -- SCOPE long int -+ SCOPE intptr_t - rde_param_query_lstop (RDE_PARAM p) - { -- (long int) rde_stack_top (p->LS); -+ return (intptr_t) rde_stack_top (p->LS); - } - SCOPE Tcl_HashTable* @@ -864,5 +864,5 @@ p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -2013,17 +1782,6 @@ + #include <stdint.h> #include <stdlib.h> #include <ctype.h> -@@ -700,8 +700,8 @@ - rde_stack_get (p->LS, lc, lv); - } -- SCOPE long int -+ SCOPE intptr_t - rde_param_query_lstop (RDE_PARAM p) - { -- (long int) rde_stack_top (p->LS); -+ return (intptr_t) rde_stack_top (p->LS); - } - SCOPE Tcl_HashTable* @@ -864,5 +864,5 @@ p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -2075,17 +1833,6 @@ + #include <stdint.h> #include <stdlib.h> #include <ctype.h> -@@ -700,8 +700,8 @@ - rde_stack_get (p->LS, lc, lv); - } -- SCOPE long int -+ SCOPE intptr_t - rde_param_query_lstop (RDE_PARAM p) - { -- (long int) rde_stack_top (p->LS); -+ return (intptr_t) rde_stack_top (p->LS); - } - SCOPE Tcl_HashTable* @@ -864,5 +864,5 @@ p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -2137,17 +1884,6 @@ + #include <stdint.h> #include <stdlib.h> #include <ctype.h> -@@ -700,8 +700,8 @@ - rde_stack_get (p->LS, lc, lv); - } -- SCOPE long int -+ SCOPE intptr_t - rde_param_query_lstop (RDE_PARAM p) - { -- (long int) rde_stack_top (p->LS); -+ return (intptr_t) rde_stack_top (p->LS); - } - SCOPE Tcl_HashTable* @@ -864,5 +864,5 @@ p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -2199,17 +1935,6 @@ + #include <stdint.h> #include <stdlib.h> #include <ctype.h> -@@ -700,8 +700,8 @@ - rde_stack_get (p->LS, lc, lv); - } -- SCOPE long int -+ SCOPE intptr_t - rde_param_query_lstop (RDE_PARAM p) - { -- (long int) rde_stack_top (p->LS); -+ return (intptr_t) rde_stack_top (p->LS); - } - SCOPE Tcl_HashTable* @@ -864,5 +864,5 @@ p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); @@ -2261,17 +1986,6 @@ + #include <stdint.h> #include <stdlib.h> #include <ctype.h> -@@ -700,8 +700,8 @@ - rde_stack_get (p->LS, lc, lv); - } -- SCOPE long int -+ SCOPE intptr_t - rde_param_query_lstop (RDE_PARAM p) - { -- (long int) rde_stack_top (p->LS); -+ return (intptr_t) rde_stack_top (p->LS); - } - SCOPE Tcl_HashTable* @@ -864,5 +864,5 @@ p->ER->msg = rde_stack_new (NULL); ASSERT_BOUNDS(s,p->numstr); Modified: head/devel/tcllib/pkg-plist ============================================================================== --- head/devel/tcllib/pkg-plist Mon Feb 8 12:00:14 2016 (r408481) +++ head/devel/tcllib/pkg-plist Mon Feb 8 12:15:53 2016 (r408482) @@ -78,6 +78,8 @@ lib/tcllib/des/des.tcl lib/tcllib/des/pkgIndex.tcl lib/tcllib/des/tcldes.tcl lib/tcllib/des/tcldesjr.tcl +lib/tcllib/dicttool/dicttool.tcl +lib/tcllib/dicttool/pkgIndex.tcl lib/tcllib/dns/dns.tcl lib/tcllib/dns/ip.tcl lib/tcllib/dns/ipMore.tcl @@ -227,6 +229,13 @@ lib/tcllib/htmlparse/htmlparse.tcl lib/tcllib/htmlparse/pkgIndex.tcl lib/tcllib/http/autoproxy.tcl lib/tcllib/http/pkgIndex.tcl +lib/tcllib/httpd/content.tcl +lib/tcllib/httpd/dispatch.tcl +lib/tcllib/httpd/httpd.tcl +lib/tcllib/httpd/pkgIndex.tcl +lib/tcllib/httpd/scgi-app.tcl +lib/tcllib/httpwget/pkgIndex.tcl +lib/tcllib/httpwget/wget.tcl lib/tcllib/ident/ident.tcl lib/tcllib/ident/pkgIndex.tcl lib/tcllib/imap4/imap4.tcl @@ -267,6 +276,8 @@ lib/tcllib/map/map_slippy_fetcher.tcl lib/tcllib/map/pkgIndex.tcl lib/tcllib/mapproj/mapproj.tcl lib/tcllib/mapproj/pkgIndex.tcl +lib/tcllib/markdown/markdown.tcl +lib/tcllib/markdown/pkgIndex.tcl lib/tcllib/math/bessel.tcl lib/tcllib/math/bigfloat.tcl lib/tcllib/math/bigfloat2.tcl @@ -277,6 +288,7 @@ lib/tcllib/math/combinatorics.tcl lib/tcllib/math/constants.tcl lib/tcllib/math/decimal.tcl lib/tcllib/math/elliptic.tcl +lib/tcllib/math/exact.tcl lib/tcllib/math/exponential.tcl lib/tcllib/math/fourier.tcl lib/tcllib/math/fuzzy.tcl @@ -337,6 +349,7 @@ lib/tcllib/nmea/pkgIndex.tcl lib/tcllib/nns/common.tcl lib/tcllib/nns/nns.tcl lib/tcllib/nns/nns_auto.tcl +lib/tcllib/nns/nns_cluster.tcl lib/tcllib/nns/pkgIndex.tcl lib/tcllib/nns/server.tcl lib/tcllib/nntp/nntp.tcl @@ -345,6 +358,11 @@ lib/tcllib/ntp/pkgIndex.tcl lib/tcllib/ntp/time.tcl lib/tcllib/oauth/oauth.tcl lib/tcllib/oauth/pkgIndex.tcl +lib/tcllib/oodialect/oodialect.tcl +lib/tcllib/oodialect/pkgIndex.tcl +lib/tcllib/oometa/oometa.tcl +lib/tcllib/oometa/oooption.tcl +lib/tcllib/oometa/pkgIndex.tcl lib/tcllib/ooutil/ooutil.tcl lib/tcllib/ooutil/pkgIndex.tcl lib/tcllib/otp/otp.tcl @@ -592,6 +610,18 @@ lib/tcllib/tie/tie_log.tcl lib/tcllib/tie/tie_rarray.tcl lib/tcllib/tiff/pkgIndex.tcl lib/tcllib/tiff/tiff.tcl +lib/tcllib/tool/ensemble.tcl +lib/tcllib/tool/event.tcl +lib/tcllib/tool/index.tcl +lib/tcllib/tool/metaclass.tcl +lib/tcllib/tool/option.tcl +lib/tcllib/tool/organ.tcl +lib/tcllib/tool/pipeline.tcl +lib/tcllib/tool/pkgIndex.tcl +lib/tcllib/tool/script.tcl +lib/tcllib/tool/uuid.tcl +lib/tcllib/tool_datatype/datatype.tcl +lib/tcllib/tool_datatype/pkgIndex.tcl lib/tcllib/transfer/connect.tcl lib/tcllib/transfer/copyops.tcl lib/tcllib/transfer/ddest.tcl @@ -605,6 +635,7 @@ lib/tcllib/treeql/treeql.tcl lib/tcllib/treeql/treeql84.tcl lib/tcllib/treeql/treeql85.tcl lib/tcllib/try/pkgIndex.tcl +lib/tcllib/try/throw.tcl lib/tcllib/try/try.tcl lib/tcllib/uev/pkgIndex.tcl lib/tcllib/uev/uevent.tcl @@ -669,437 +700,431 @@ lib/tcllib/wip/pkgIndex.tcl lib/tcllib/wip/wip.tcl lib/tcllib/wip/wip2.tcl lib/tcllib/yaml/huddle.tcl +lib/tcllib/yaml/huddle_types.tcl +lib/tcllib/yaml/json2huddle.tcl lib/tcllib/yaml/pkgIndex.tcl lib/tcllib/yaml/yaml.tcl lib/tcllib/zip/decode.tcl lib/tcllib/zip/encode.tcl +lib/tcllib/zip/mkzip.tcl lib/tcllib/zip/pkgIndex.tcl -%%MAN%%man/mann/S3.tcllib.n.gz -%%MAN%%man/mann/adjust.tcllib.n.gz -%%MAN%%man/mann/adler32.tcllib.n.gz -%%MAN%%man/mann/aes.tcllib.n.gz -%%MAN%%man/mann/annealing.tcllib.n.gz -%%MAN%%man/mann/ansi_cattr.tcllib.n.gz -%%MAN%%man/mann/ansi_cctrl.tcllib.n.gz -%%MAN%%man/mann/ansi_cmacros.tcllib.n.gz -%%MAN%%man/mann/ansi_code.tcllib.n.gz -%%MAN%%man/mann/ansi_ctrlu.tcllib.n.gz -%%MAN%%man/mann/ansi_send.tcllib.n.gz -%%MAN%%man/mann/ascii85.tcllib.n.gz -%%MAN%%man/mann/asn.tcllib.n.gz -%%MAN%%man/mann/async.tcllib.n.gz -%%MAN%%man/mann/autoproxy.tcllib.n.gz -%%MAN%%man/mann/aycock.tcllib.n.gz -%%MAN%%man/mann/base32.tcllib.n.gz -%%MAN%%man/mann/base32core.tcllib.n.gz -%%MAN%%man/mann/base32hex.tcllib.n.gz -%%MAN%%man/mann/base64.tcllib.n.gz -%%MAN%%man/mann/bee.tcllib.n.gz -%%MAN%%man/mann/bench.tcllib.n.gz -%%MAN%%man/mann/bench_intro.tcllib.n.gz -%%MAN%%man/mann/bench_lang_intro.tcllib.n.gz -%%MAN%%man/mann/bench_lang_spec.tcllib.n.gz -%%MAN%%man/mann/bench_read.tcllib.n.gz -%%MAN%%man/mann/bench_wcsv.tcllib.n.gz -%%MAN%%man/mann/bench_wtext.tcllib.n.gz -%%MAN%%man/mann/bibtex.tcllib.n.gz -%%MAN%%man/mann/bigfloat.tcllib.n.gz -%%MAN%%man/mann/bignum.tcllib.n.gz -%%MAN%%man/mann/blowfish.tcllib.n.gz -%%MAN%%man/mann/calculus.tcllib.n.gz -%%MAN%%man/mann/cat.tcllib.n.gz -%%MAN%%man/mann/cc_amex.tcllib.n.gz -%%MAN%%man/mann/cc_discover.tcllib.n.gz -%%MAN%%man/mann/cc_mastercard.tcllib.n.gz -%%MAN%%man/mann/cc_visa.tcllib.n.gz -%%MAN%%man/mann/cfront.tcllib.n.gz -%%MAN%%man/mann/cgen.tcllib.n.gz -%%MAN%%man/mann/changelog.tcllib.n.gz -%%MAN%%man/mann/cksum.tcllib.n.gz -%%MAN%%man/mann/cmdline.tcllib.n.gz -%%MAN%%man/mann/combinatorics.tcllib.n.gz -%%MAN%%man/mann/comm.tcllib.n.gz -%%MAN%%man/mann/comm_wire.tcllib.n.gz -%%MAN%%man/mann/connect.tcllib.n.gz -%%MAN%%man/mann/constants.tcllib.n.gz -%%MAN%%man/mann/container.tcllib.n.gz -%%MAN%%man/mann/control.tcllib.n.gz -%%MAN%%man/mann/copyops.tcllib.n.gz -%%MAN%%man/mann/core.tcllib.n.gz -%%MAN%%man/mann/coro_auto.tcllib.n.gz -%%MAN%%man/mann/coroutine.tcllib.n.gz -%%MAN%%man/mann/counter.tcllib.n.gz -%%MAN%%man/mann/crc16.tcllib.n.gz -%%MAN%%man/mann/crc32.tcllib.n.gz -%%MAN%%man/mann/cron.tcllib.n.gz -%%MAN%%man/mann/csv.tcllib.n.gz -%%MAN%%man/mann/cvs.tcllib.n.gz -%%MAN%%man/mann/dacceptor.tcllib.n.gz -%%MAN%%man/mann/ddest.tcllib.n.gz -%%MAN%%man/mann/debug.tcllib.n.gz -%%MAN%%man/mann/debug_caller.tcllib.n.gz -%%MAN%%man/mann/debug_heartbeat.tcllib.n.gz -%%MAN%%man/mann/debug_timestamp.tcllib.n.gz -%%MAN%%man/mann/decimal.tcllib.n.gz -%%MAN%%man/mann/decode.tcllib.n.gz -%%MAN%%man/mann/deleg_method.tcllib.n.gz -%%MAN%%man/mann/deleg_proc.tcllib.n.gz -%%MAN%%man/mann/des.tcllib.n.gz -%%MAN%%man/mann/dexec.tcllib.n.gz -%%MAN%%man/mann/disjointset.tcllib.n.gz -%%MAN%%man/mann/dns.tcllib.n.gz -%%MAN%%man/mann/docidx.tcllib.n.gz -%%MAN%%man/mann/docidx_intro.tcllib.n.gz -%%MAN%%man/mann/docidx_lang_cmdref.tcllib.n.gz -%%MAN%%man/mann/docidx_lang_faq.tcllib.n.gz -%%MAN%%man/mann/docidx_lang_intro.tcllib.n.gz -%%MAN%%man/mann/docidx_lang_syntax.tcllib.n.gz -%%MAN%%man/mann/docidx_plugin_apiref.tcllib.n.gz -%%MAN%%man/mann/docstrip.tcllib.n.gz -%%MAN%%man/mann/docstrip_util.tcllib.n.gz -%%MAN%%man/mann/doctoc.tcllib.n.gz -%%MAN%%man/mann/doctoc_intro.tcllib.n.gz -%%MAN%%man/mann/doctoc_lang_cmdref.tcllib.n.gz -%%MAN%%man/mann/doctoc_lang_faq.tcllib.n.gz -%%MAN%%man/mann/doctoc_lang_intro.tcllib.n.gz -%%MAN%%man/mann/doctoc_lang_syntax.tcllib.n.gz -%%MAN%%man/mann/doctoc_plugin_apiref.tcllib.n.gz -%%MAN%%man/mann/doctools.tcllib.n.gz -%%MAN%%man/mann/doctools_intro.tcllib.n.gz -%%MAN%%man/mann/doctools_lang_cmdref.tcllib.n.gz -%%MAN%%man/mann/doctools_lang_faq.tcllib.n.gz -%%MAN%%man/mann/doctools_lang_intro.tcllib.n.gz -%%MAN%%man/mann/doctools_lang_syntax.tcllib.n.gz -%%MAN%%man/mann/doctools_plugin_apiref.tcllib.n.gz -%%MAN%%man/mann/dsource.tcllib.n.gz -%%MAN%%man/mann/dtplite.tcllib.n.gz -%%MAN%%man/mann/ean13.tcllib.n.gz -%%MAN%%man/mann/encode.tcllib.n.gz -%%MAN%%man/mann/events.tcllib.n.gz -%%MAN%%man/mann/expander.tcllib.n.gz -%%MAN%%man/mann/export.tcllib.n.gz -%%MAN%%man/mann/export_docidx.tcllib.n.gz -%%MAN%%man/mann/export_doctoc.tcllib.n.gz -%%MAN%%man/mann/export_html.tcllib.n.gz -%%MAN%%man/mann/export_json.tcllib.n.gz -%%MAN%%man/mann/export_nroff.tcllib.n.gz -%%MAN%%man/mann/export_text.tcllib.n.gz -%%MAN%%man/mann/export_wiki.tcllib.n.gz -%%MAN%%man/mann/fa.tcllib.n.gz -%%MAN%%man/mann/facade.tcllib.n.gz -%%MAN%%man/mann/faop.tcllib.n.gz -%%MAN%%man/mann/fifo.tcllib.n.gz -%%MAN%%man/mann/fifo2.tcllib.n.gz -%%MAN%%man/mann/filetypes.tcllib.n.gz -%%MAN%%man/mann/fileutil.tcllib.n.gz -%%MAN%%man/mann/fourier.tcllib.n.gz -%%MAN%%man/mann/ftp.tcllib.n.gz -%%MAN%%man/mann/ftp_geturl.tcllib.n.gz -%%MAN%%man/mann/ftpd.tcllib.n.gz -%%MAN%%man/mann/fuzzy.tcllib.n.gz -%%MAN%%man/mann/gasm.tcllib.n.gz -%%MAN%%man/mann/generator.tcllib.n.gz -%%MAN%%man/mann/gpx.tcllib.n.gz -%%MAN%%man/mann/graph.tcllib.n.gz -%%MAN%%man/mann/graph1.tcllib.n.gz -%%MAN%%man/mann/graphops.tcllib.n.gz -%%MAN%%man/mann/gtoken.tcllib.n.gz -%%MAN%%man/mann/halfpipe.tcllib.n.gz -%%MAN%%man/mann/hex.tcllib.n.gz -%%MAN%%man/mann/hook.tcllib.n.gz -%%MAN%%man/mann/html.tcllib.n.gz -%%MAN%%man/mann/html_cssdefaults.tcllib.n.gz -%%MAN%%man/mann/htmlparse.tcllib.n.gz -%%MAN%%man/mann/huddle.tcllib.n.gz -%%MAN%%man/mann/iban.tcllib.n.gz -%%MAN%%man/mann/ident.tcllib.n.gz -%%MAN%%man/mann/identity.tcllib.n.gz -%%MAN%%man/mann/idx_container.tcllib.n.gz -%%MAN%%man/mann/idx_export.tcllib.n.gz -%%MAN%%man/mann/idx_export_html.tcllib.n.gz -%%MAN%%man/mann/idx_export_json.tcllib.n.gz -%%MAN%%man/mann/idx_export_nroff.tcllib.n.gz -%%MAN%%man/mann/idx_export_text.tcllib.n.gz -%%MAN%%man/mann/idx_export_wiki.tcllib.n.gz -%%MAN%%man/mann/idx_import.tcllib.n.gz -%%MAN%%man/mann/idx_import_json.tcllib.n.gz -%%MAN%%man/mann/idx_introduction.tcllib.n.gz -%%MAN%%man/mann/idx_msgcat_c.tcllib.n.gz -%%MAN%%man/mann/idx_msgcat_de.tcllib.n.gz -%%MAN%%man/mann/idx_msgcat_en.tcllib.n.gz -%%MAN%%man/mann/idx_msgcat_fr.tcllib.n.gz -%%MAN%%man/mann/idx_parse.tcllib.n.gz -%%MAN%%man/mann/idx_structure.tcllib.n.gz -%%MAN%%man/mann/imap4.tcllib.n.gz -%%MAN%%man/mann/imei.tcllib.n.gz -%%MAN%%man/mann/imenu.tcllib.n.gz -%%MAN%%man/mann/import.tcllib.n.gz -%%MAN%%man/mann/import_docidx.tcllib.n.gz -%%MAN%%man/mann/import_doctoc.tcllib.n.gz -%%MAN%%man/mann/import_json.tcllib.n.gz -%%MAN%%man/mann/ini.tcllib.n.gz -%%MAN%%man/mann/interp.tcllib.n.gz -%%MAN%%man/mann/interpolate.tcllib.n.gz -%%MAN%%man/mann/introduction.tcllib.n.gz -%%MAN%%man/mann/ip.tcllib.n.gz -%%MAN%%man/mann/ipager.tcllib.n.gz -%%MAN%%man/mann/irc.tcllib.n.gz -%%MAN%%man/mann/isbn.tcllib.n.gz -%%MAN%%man/mann/iso8601.tcllib.n.gz -%%MAN%%man/mann/javascript.tcllib.n.gz -%%MAN%%man/mann/jpeg.tcllib.n.gz -%%MAN%%man/mann/json.tcllib.n.gz -%%MAN%%man/mann/json_write.tcllib.n.gz -%%MAN%%man/mann/lambda.tcllib.n.gz -%%MAN%%man/mann/ldap.tcllib.n.gz -%%MAN%%man/mann/ldapx.tcllib.n.gz -%%MAN%%man/mann/limitsize.tcllib.n.gz -%%MAN%%man/mann/linalg.tcllib.n.gz -%%MAN%%man/mann/log.tcllib.n.gz -%%MAN%%man/mann/logger.tcllib.n.gz -%%MAN%%man/mann/loggerAppender.tcllib.n.gz -%%MAN%%man/mann/loggerUtils.tcllib.n.gz -%%MAN%%man/mann/luhn.tcllib.n.gz -%%MAN%%man/mann/luhn5.tcllib.n.gz -%%MAN%%man/mann/machineparameters.tcllib.n.gz -%%MAN%%man/mann/map_geocode_nominatim.tcllib.n.gz -%%MAN%%man/mann/map_slippy.tcllib.n.gz -%%MAN%%man/mann/map_slippy_cache.tcllib.n.gz -%%MAN%%man/mann/map_slippy_fetcher.tcllib.n.gz -%%MAN%%man/mann/mapproj.tcllib.n.gz -%%MAN%%man/mann/math.tcllib.n.gz -%%MAN%%man/mann/math_geometry.tcllib.n.gz -%%MAN%%man/mann/matrix.tcllib.n.gz -%%MAN%%man/mann/matrix1.tcllib.n.gz -%%MAN%%man/mann/md4.tcllib.n.gz -%%MAN%%man/mann/md5.tcllib.n.gz -%%MAN%%man/mann/md5crypt.tcllib.n.gz -%%MAN%%man/mann/me_ast.tcllib.n.gz -%%MAN%%man/mann/me_cpu.tcllib.n.gz -%%MAN%%man/mann/me_cpucore.tcllib.n.gz -%%MAN%%man/mann/me_intro.tcllib.n.gz *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602081215.u18CFrkw078007>