Index: irc/eggdrop/Makefile =================================================================== --- irc/eggdrop/Makefile (revision 318024) +++ irc/eggdrop/Makefile (working copy) @@ -16,6 +16,8 @@ USE_TCL= 85+ GNU_CONFIGURE= yes +CONFIGURE_ARGS+=--with-tcllib=${LOCALBASE}/lib/libtcl${TCL_VER:S/.//}.so \ + --with-tclinc=${LOCALBASE}/include/tcl${TCL_VER}/tcl.h MAKE_JOBS_UNSAFE= yes MAN1= eggdrop.1 Index: irc/eggdrop-devel/Makefile =================================================================== --- irc/eggdrop-devel/Makefile (revision 318075) +++ irc/eggdrop-devel/Makefile (working copy) @@ -1,7 +1,4 @@ -# New ports collection makefile for: eggdrop-devel -# Date created: June 13, 2011 -# Whom: Beech Rintoul -# +# Created by: Beech Rintoul # $FreeBSD$ PORTNAME= eggdrop @@ -20,6 +17,8 @@ USE_TCL= 85+ GNU_CONFIGURE= yes +CONFIGURE_ARGS+=--with-tcllib=${LOCALBASE}/lib/libtcl${TCL_VER:S/.//}.so \ + --with-tclinc=${LOCALBASE}/include/tcl${TCL_VER}/tcl.h MAKE_JOBS_UNSAFE= yes @@ -112,7 +111,7 @@ @${MKDIR} ${DOCSDIR}/html cd ${WRKSRC}/doc/html && ${INSTALL_DATA} *.html ${DOCSDIR}/html @${MKDIR} ${DOCSDIR}/settings - cd ${WRKSRC}/doc/settings && $(RM) -rf CVS \ + cd ${WRKSRC}/doc/settings && ${RM} -rf CVS \ && ${INSTALL_DATA} * ${DOCSDIR}/settings .endif @${CAT} ${PKGMESSAGE} Index: www/tdom/files/patch-generic-tcldom.c =================================================================== --- www/tdom/files/patch-generic-tcldom.c (revision 0) +++ www/tdom/files/patch-generic-tcldom.c (working copy) @@ -0,0 +1,11 @@ +--- ../generic/tcldom.c.orig 2013-05-13 11:36:27.000000000 +0200 ++++ ../generic/tcldom.c 2013-05-13 11:39:00.000000000 +0200 +@@ -5934,7 +5934,7 @@ + if (ret == TCL_ERROR) { + char msg[64 + TCL_INTEGER_SPACE]; + sprintf(msg, "\n (\"%s %s\" body line %d)", Tcl_GetString(objv[0]), +- Tcl_GetString(objv[1]), interp->errorLine); ++ Tcl_GetString(objv[1]), Tcl_GetErrorLine(interp)); + Tcl_AddErrorInfo(interp, msg); + } + Property changes on: www/tdom/files/patch-generic-tcldom.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: textproc/tclExpat/files/patch-aa =================================================================== --- textproc/tclExpat/files/patch-aa (revision 313650) +++ textproc/tclExpat/files/patch-aa (working copy) @@ -1,5 +1,5 @@ ---- tclexpat.c Sat Aug 22 03:35:44 1998 -+++ tclexpat.c Mon Aug 14 14:58:38 2006 +--- tclexpat.c.orig 1998-08-22 09:35:44.000000000 +0200 ++++ tclexpat.c 2013-05-13 12:11:18.000000000 +0200 @@ -18,8 +18,9 @@ * */ @@ -79,7 +79,18 @@ /* *---------------------------------------------------------------------------- -@@ -267,7 +270,6 @@ +@@ -157,6 +160,10 @@ + Tcl_Interp *interp; /* Interpreter to initialise. */ + { + ++ if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) { ++ return TCL_ERROR; ++ } ++ + Tcl_PkgProvide(interp, "expat", "1.1"); + + Tcl_CreateObjCommand(interp, "expat", TclExpatObjCmd, NULL, NULL); +@@ -267,7 +274,6 @@ Tcl_Interp *interp; TclExpatInfo *expat; { @@ -87,7 +98,7 @@ if (!(expat->parser = XML_ParserCreate(NULL))) { Tcl_SetResult(interp, "unable to create expat parser", NULL); -@@ -284,22 +286,22 @@ +@@ -284,22 +290,22 @@ */ XML_SetElementHandler(expat->parser, @@ -119,7 +130,7 @@ (void *) expat); XML_SetUserData(expat->parser, (void *) expat); -@@ -327,7 +329,6 @@ +@@ -327,7 +333,6 @@ TclExpatFreeParser(expat) TclExpatInfo *expat; { @@ -127,7 +138,7 @@ XML_ParserFree(expat->parser); expat->parser = NULL; -@@ -357,9 +358,9 @@ +@@ -357,9 +362,9 @@ Tcl_Obj *CONST objv[]; { TclExpatInfo *expat = (TclExpatInfo *) clientData; @@ -139,7 +150,7 @@ "configure", "cget", "parse", "reset", NULL }; enum options { -@@ -464,10 +465,10 @@ +@@ -464,10 +469,10 @@ if (!result) { Tcl_ResetResult(interp); @@ -152,7 +163,7 @@ Tcl_AppendResult(interp, s, NULL); return TCL_ERROR; -@@ -514,7 +515,7 @@ +@@ -514,7 +519,7 @@ int objc; Tcl_Obj *CONST objv[]; { @@ -161,7 +172,7 @@ "-final", "-baseurl", "-elementstartcommand", -@@ -688,7 +689,7 @@ +@@ -688,7 +693,7 @@ } if (doParse) { @@ -170,7 +181,7 @@ } else { return TCL_OK; } -@@ -739,7 +740,7 @@ +@@ -739,7 +744,7 @@ *---------------------------------------------------------------------------- */ @@ -179,7 +190,7 @@ TclExpatHandlerResult(expat, result) TclExpatInfo *expat; int result; -@@ -795,7 +796,7 @@ +@@ -795,7 +800,7 @@ *---------------------------------------------------------------------------- */ @@ -188,7 +199,7 @@ TclExpatElementStartHandler(userData, name, atts) void *userData; const char *name; -@@ -828,8 +829,8 @@ +@@ -828,8 +833,8 @@ atList = Tcl_NewListObj(0, NULL); for (atPtr = atts; atPtr[0] && atPtr[1]; atPtr += 2) { @@ -199,7 +210,7 @@ } /* -@@ -840,14 +841,14 @@ +@@ -840,14 +845,14 @@ Tcl_IncrRefCount(cmdPtr); Tcl_Preserve((ClientData) expat->interp); @@ -216,7 +227,7 @@ result = Tcl_GlobalEvalObj(expat->interp, cmdPtr); #else result = Tcl_EvalObj(expat->interp, cmdPtr, TCL_EVAL_GLOBAL); -@@ -877,7 +878,7 @@ +@@ -877,7 +882,7 @@ *---------------------------------------------------------------------------- */ @@ -225,7 +236,7 @@ TclExpatElementEndHandler(userData, name) void *userData; CONST char *name; -@@ -911,13 +912,13 @@ +@@ -911,13 +916,13 @@ Tcl_IncrRefCount(cmdPtr); Tcl_Preserve((ClientData) expat->interp); @@ -241,7 +252,7 @@ result = Tcl_GlobalEvalObj(expat->interp, cmdPtr); #else result = Tcl_EvalObj(expat->interp, cmdPtr, TCL_EVAL_GLOBAL); -@@ -947,7 +948,7 @@ +@@ -947,7 +952,7 @@ *---------------------------------------------------------------------------- */ @@ -250,7 +261,7 @@ TclExpatCharacterDataHandler(userData, s, len) void *userData; CONST char *s; -@@ -970,13 +971,13 @@ +@@ -970,13 +975,13 @@ Tcl_IncrRefCount(cmdPtr); Tcl_Preserve((ClientData) expat->interp); @@ -266,7 +277,7 @@ result = Tcl_GlobalEvalObj(expat->interp, cmdPtr); #else result = Tcl_EvalObj(expat->interp, cmdPtr, TCL_EVAL_GLOBAL); -@@ -1006,7 +1007,7 @@ +@@ -1006,7 +1011,7 @@ *---------------------------------------------------------------------------- */ @@ -275,7 +286,7 @@ TclExpatProcessingInstructionHandler(userData, target, data) void *userData; CONST char *target; -@@ -1029,14 +1030,14 @@ +@@ -1029,14 +1034,14 @@ Tcl_IncrRefCount(cmdPtr); Tcl_Preserve((ClientData) expat->interp); @@ -293,7 +304,7 @@ result = Tcl_GlobalEvalObj(expat->interp, cmdPtr); #else result = Tcl_EvalObj(expat->interp, cmdPtr, TCL_EVAL_GLOBAL); -@@ -1066,7 +1067,7 @@ +@@ -1066,7 +1071,7 @@ *---------------------------------------------------------------------------- */ @@ -302,7 +313,7 @@ TclExpatDefaultHandler(userData, s, len) void *userData; CONST char *s; -@@ -1089,13 +1090,13 @@ +@@ -1089,13 +1094,13 @@ Tcl_IncrRefCount(cmdPtr); Tcl_Preserve((ClientData) expat->interp); @@ -318,7 +329,7 @@ result = Tcl_GlobalEvalObj(expat->interp, cmdPtr); #else result = Tcl_EvalObj(expat->interp, cmdPtr, TCL_EVAL_GLOBAL); -@@ -1125,7 +1126,7 @@ +@@ -1125,7 +1130,7 @@ *---------------------------------------------------------------------------- */ @@ -327,7 +338,7 @@ TclExpatUnparsedDeclHandler(userData, entityname, base, systemId, publicId, notationName) void *userData; CONST char *entityname; -@@ -1151,25 +1152,25 @@ +@@ -1151,25 +1156,25 @@ Tcl_IncrRefCount(cmdPtr); Tcl_Preserve((ClientData) expat->interp); @@ -359,7 +370,7 @@ result = Tcl_GlobalEvalObj(expat->interp, cmdPtr); #else result = Tcl_EvalObj(expat->interp, cmdPtr, TCL_EVAL_GLOBAL); -@@ -1199,7 +1200,7 @@ +@@ -1199,7 +1204,7 @@ *---------------------------------------------------------------------------- */ @@ -368,7 +379,7 @@ TclExpatNotationDeclHandler(userData, notationName, base, systemId, publicId) void *userData; CONST char *notationName; -@@ -1224,24 +1225,24 @@ +@@ -1224,24 +1229,24 @@ Tcl_IncrRefCount(cmdPtr); Tcl_Preserve((ClientData) expat->interp); @@ -398,7 +409,7 @@ result = Tcl_GlobalEvalObj(expat->interp, cmdPtr); #else result = Tcl_EvalObj(expat->interp, cmdPtr, TCL_EVAL_GLOBAL); -@@ -1279,15 +1280,18 @@ +@@ -1279,15 +1284,18 @@ XML_Encoding *info; { TclExpatInfo *expat = (TclExpatInfo *) encodingHandlerData; @@ -419,7 +430,7 @@ } /* -@@ -1306,7 +1310,7 @@ +@@ -1306,7 +1314,7 @@ * It would be desirable to be able to terminate parsing * if the return result is TCL_ERROR or TCL_BREAK. */ @@ -428,7 +439,7 @@ result = Tcl_GlobalEvalObj(expat->interp, cmdPtr); #else result = Tcl_EvalObj(expat->interp, cmdPtr, TCL_EVAL_GLOBAL); -@@ -1317,7 +1321,8 @@ +@@ -1317,7 +1325,8 @@ TclExpatHandlerResult(expat, result); @@ -438,7 +449,7 @@ } /* -@@ -1336,7 +1341,7 @@ +@@ -1336,7 +1345,7 @@ *---------------------------------------------------------------------------- */ @@ -447,7 +458,7 @@ TclExpatExternalEntityRefHandler(parser, openEntityNames, base, systemId, publicId) XML_Parser parser; CONST char *openEntityNames; -@@ -1350,7 +1355,7 @@ +@@ -1350,7 +1359,7 @@ if (expat->externalentitycommand == NULL || expat->status != TCL_OK) { @@ -456,7 +467,7 @@ } /* -@@ -1361,16 +1366,16 @@ +@@ -1361,16 +1370,16 @@ Tcl_IncrRefCount(cmdPtr); Tcl_Preserve((ClientData) expat->interp); @@ -478,7 +489,7 @@ result = Tcl_GlobalEvalObj(expat->interp, cmdPtr); #else result = Tcl_EvalObj(expat->interp, cmdPtr, TCL_EVAL_GLOBAL); -@@ -1381,7 +1386,7 @@ +@@ -1381,7 +1390,7 @@ TclExpatHandlerResult(expat, result); Index: x11-toolkits/tkshape/Makefile =================================================================== --- x11-toolkits/tkshape/Makefile (revision 318101) +++ x11-toolkits/tkshape/Makefile (working copy) @@ -35,8 +35,8 @@ USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-tclconf=${LOCALBASE}/lib/tcl${TCL_VER} \ - --with-tkconf=${LOCALBASE}/lib/tk${TK_VER} +CONFIGURE_ARGS= --with-tclconf=${TCL_LIBDIR} \ + --with-tkconf=${TK_LIBDIR} CONFIGURE_WRKSRC= ${WRKSRC}/unix BUILD_WRKSRC= ${CONFIGURE_WRKSRC} Index: x11-toolkits/tkshape/files/patch-test-syntax.text =================================================================== --- x11-toolkits/tkshape/files/patch-test-syntax.text (revision 0) +++ x11-toolkits/tkshape/files/patch-test-syntax.text (working copy) @@ -0,0 +1,139 @@ +--- tests/syntax.test.orig 2013-05-13 17:26:43.000000000 +0200 ++++ tests/syntax.test 2013-05-13 17:26:27.000000000 +0200 +@@ -15,20 +15,20 @@ + namespace import ::tcltest::* + } + +-package require shape ++package require Shape + + # top-level error messages + test syntax-1.1 {Shape needs subcommand} { + list [catch { + shape + } msg] $msg +-} {1 "wrong # args: should be \"shape subcommand ?window arg ...?\""} ++} {1 {wrong # args: should be "shape subcommand ?window arg ...?"}} + test syntax-1.2 {Shape subcommand list} { + list [catch { + shape Dummy + } msg] $msg +-} {1 "bad subcommand \"Dummy\": must be\ +- bounds, get, offset, set, update, or version"} ++} {1 {bad subcommand "Dummy": must be\ ++ bounds, get, offset, set, update, or version}} + test syntax-1.3 {Variables were created} { + list [info exist shape_version] [info exist shape_patchLevel] + } {1 1} +@@ -38,7 +38,7 @@ + list [catch { + shape version Dummy + } msg] $msg +-} {1 " wrong # args: should be \"shape version\""} ++} {1 {wrong # args: should be "shape version"}} + test syntax-2.2 {Shape version: result format} { + string is double -strict [shape version] + } {1} +@@ -48,84 +48,84 @@ + list [catch { + shape set + } msg] $msg +-} {1 "wrong # args: should be \"shape set pathName ?options?\""} ++} {1 {wrong # args: should be "shape set pathName ?options?"}} + test syntax-3.2 {Shape set: needs window pathname} { + list [catch { + shape set not-a-window + } msg] $msg +-} {1 "bad window path name \"not-a-window\""} ++} {1 {bad window path name "not-a-window"}} + + # get subcommand + test syntax-4.1 {Shape get: command format} { + list [catch { + shape get + } msg] $msg +-} {1 "wrong # args: should be \"shape get pathName ?-bounding/-clip?\""} ++} {1 {wrong # args: should be "shape get pathName ?-bounding/-clip?"}} + test syntax-4.2 {Shape get: command format} { + list [catch { + shape get ? ? ? + } msg] $msg +-} {1 "wrong # args: should be \"shape get pathName ?-bounding/-clip?\""} ++} {1 {wrong # args: should be "shape get pathName ?-bounding/-clip?"}} + test syntax-4.3 {Shape get: needs window pathname} { + list [catch { + shape get not-a-window + } msg] $msg +-} {1 "bad window path name \"not-a-window\""} ++} {1 {bad window path name "not-a-window"}} + + # update subcommand + test syntax-5.1 {Shape update: command format} { + list [catch { + shape update + } msg] $msg +-} {1 "wrong # args: should be \"shape update pathName operation ?options?\""} ++} {1 {wrong # args: should be "shape update pathName operation ?options?"}} + + # offset subcommand + test syntax-6.1 {Shape offset: command format} { + list [catch { + shape offset + } msg] $msg +-} {1 "wrong # args: should be\ +- \"shape offset pathName ?-bounding/-clip/-both? x y\""} ++} {1 {wrong # args: should be\ ++ "shape offset pathName ?-bounding/-clip/-both? x y"}} + test syntax-6.2 {Shape offset: command format} { + list [catch { + shape offset ? + } msg] $msg +-} {1 "wrong # args: should be\ +- \"shape offset pathName ?-bounding/-clip/-both? x y\""} ++} {1 {wrong # args: should be\ ++ "shape offset pathName ?-bounding/-clip/-both? x y"}} + test syntax-6.3 {Shape offset: command format} { + list [catch { + shape offset ? ? + } msg] $msg +-} {1 "wrong # args: should be\ +- \"shape offset pathName ?-bounding/-clip/-both? x y\""} ++} {1 {wrong # args: should be\ ++ "shape offset pathName ?-bounding/-clip/-both? x y"}} + test syntax-6.4 {Shape offset: command format} { + list [catch { + shape offset ? ? ? ? ? + } msg] $msg +-} {1 "wrong # args: should be\ +- \"shape offset pathName ?-bounding/-clip/-both? x y\""} ++} {1 {wrong # args: should be\ ++ "shape offset pathName ?-bounding/-clip/-both? x y"}} + test syntax-6.5 {Shape offset: needs window pathname} { + list [catch { + shape offset not-a-window 0 0 + } msg] $msg +-} {1 "bad window path name \"not-a-window\""} ++} {1 {bad window path name "not-a-window"}} + + # bounds subcommand + test syntax-7.1 {Shape bounds: command format} { + list [catch { + shape bounds + } msg] $msg +-} {1 "wrong # args: should be \"shape bounds pathName ?-bounding/-clip?\""} ++} {1 {wrong # args: should be "shape bounds pathName ?-bounding/-clip?"}} + test syntax-7.2 {Shape bounds: command format} { + list [catch { + shape bounds ? ? ? + } msg] $msg +-} {1 "wrong # args: should be \"shape bounds pathName ?-bounding/-clip?\""} ++} {1 {wrong # args: should be "shape bounds pathName ?-bounding/-clip?"}} + test syntax-7.3 {Shape bounds: needs window pathname} { + list [catch { + shape bounds not-a-window + } msg] $msg +-} {1 "bad window path name \"not-a-window\""} ++} {1 {bad window path name "not-a-window"}} + + # cleanup + ::tcltest::cleanupTests Property changes on: x11-toolkits/tkshape/files/patch-test-syntax.text ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: x11-toolkits/tkshape/files/patch-unix-Makefile.in =================================================================== --- x11-toolkits/tkshape/files/patch-unix-Makefile.in (revision 0) +++ x11-toolkits/tkshape/files/patch-unix-Makefile.in (working copy) @@ -0,0 +1,11 @@ +--- unix/Makefile.in.orig 2000-09-11 17:10:01.000000000 +0200 ++++ unix/Makefile.in 2013-05-13 17:20:31.000000000 +0200 +@@ -71,7 +71,7 @@ + $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/shapeUnixText.c + # ---------------------------------------------------------------------- + $(SOFILE): $(OBJS) +- ${SHLIB_LD} -o $@ $^ @SHLIB_LD_LIBS@ ++ ${SHLIB_LD} -o $@ $^ @SHLIB_LD_LIBS@ ${TK_LIB_SPEC} ${TCL_LIB_SPEC} ${TK_LIBS} + $(EXEFILE): $(OBJS) tkAppInit.o + $(CC) -o $@ $^ @SHLIB_LD_LIBS@ ${TK_LIB_SPEC} ${TCL_LIB_SPEC} ${TK_LIBS} + # ---------------------------------------------------------------------- Property changes on: x11-toolkits/tkshape/files/patch-unix-Makefile.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property