Index: head/devel/critcl/Makefile =================================================================== --- head/devel/critcl/Makefile (revision 405407) +++ head/devel/critcl/Makefile (revision 405408) @@ -1,43 +1,45 @@ # Created by: gahr@FreeBSD.org # $FreeBSD$ PORTNAME= critcl -PORTVERSION= 3.1.12 -PORTREVISION= 3 +PORTVERSION= 3.1.15 CATEGORIES= devel MAINTAINER= tcltk@FreeBSD.org COMMENT= Compiled Runtime in Tcl LICENSE= TclTk LICENSE_NAME= Tcl/Tk License LICENSE_FILE= ${WRKSRC}/license.terms LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept RUN_DEPENDS= ${LOCALBASE}/lib/Trf/pkgIndex.tcl:${PORTSDIR}/devel/tcl-trf \ ${LOCALBASE}/lib/tcllib/cmdline/pkgIndex.tcl:${PORTSDIR}/devel/tcllib -USES+= tcl +USES+= tcl:85+ USE_GITHUB= yes GH_ACCOUNT= andreas-kupries +TEST_TARGET= test + PLIST_SUB+= VER=${PORTVERSION} PORTDOCS= * NO_BUILD= yes .include post-patch: ${REINPLACE_CMD} -e 's|dtplite|${LOCALBASE}/bin/dtplite|g' ${WRKSRC}/build.tcl ${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g' ${WRKSRC}/lib/critcl/Config + ${REINPLACE_CMD} -e '/^#line/d' ${WRKSRC}/test/cconst/* do-install: (cd ${WRKSRC} && ${TCLSH} build.tcl install ${STAGEDIR}${PREFIX}/lib) ${INSTALL_MAN} ${WRKSRC}/embedded/man/files/critcl_*.n \ ${STAGEDIR}${MANPREFIX}/man/mann/ -test check regression-test: build +test: build (cd ${WRKSRC} && ${TCLSH} test/all.tcl) .include Index: head/devel/critcl/distinfo =================================================================== --- head/devel/critcl/distinfo (revision 405407) +++ head/devel/critcl/distinfo (revision 405408) @@ -1,2 +1,2 @@ -SHA256 (andreas-kupries-critcl-3.1.12_GH0.tar.gz) = 7be0cff46d5632ea57108d0aef8eab4503232429ae1fa6ad130764671f46c7a5 -SIZE (andreas-kupries-critcl-3.1.12_GH0.tar.gz) = 1678397 +SHA256 (andreas-kupries-critcl-3.1.15_GH0.tar.gz) = d93facfc2f1407941ee22157f08add2fdfbc5a48b9a5e1a1b8665a0af32d4ff7 +SIZE (andreas-kupries-critcl-3.1.15_GH0.tar.gz) = 1678961 Index: head/devel/critcl/files/patch-tests =================================================================== --- head/devel/critcl/files/patch-tests (revision 405407) +++ head/devel/critcl/files/patch-tests (nonexistent) @@ -1,151 +0,0 @@ -diff --git test/ccommand.test test/ccommand.test -index 06e35eb..e0f9242 100644 ---- test/ccommand.test -+++ test/ccommand.test -@@ -34,7 +34,7 @@ test critcl-ccommand-1.0 {ccommand, wrong\#args} -setup { - } -body { - critcl::ccommand - } -cleanup { --} -returnCodes error -result {wrong # args: should be "critcl::ccommand name anames ..."} -+} -returnCodes error -result {wrong # args: should be "critcl::ccommand name anames ?arg ...?"} - - # ------------------------------------------------------------------------- - ## Go through the various knobs we can use to configure the definition and output -diff --git test/cproc.test test/cproc.test -index 13a6d6f..454554a 100644 ---- test/cproc.test -+++ test/cproc.test -@@ -36,7 +36,7 @@ test critcl-cproc-1.0 {cproc, wrong\#args} -setup { - } -body { - critcl::cproc - } -cleanup { --} -returnCodes error -result {wrong # args: should be "critcl::cproc name adefs rtype ?body? ..."} -+} -returnCodes error -result {wrong # args: should be "critcl::cproc name adefs rtype ?body? ?arg ...?"} - - # ------------------------------------------------------------------------- - ## Go through the various knobs we can use to configure the definition and output -diff --git test/cproc/2.0 test/cproc/2.0 -index 919c469..98258df 100644 ---- test/cproc/2.0 -+++ test/cproc/2.0 -@@ -18,6 +18,6 @@ tcl__aproc0(ClientData cd, Tcl_Interp *interp, int oc, Tcl_Obj *CONST ov[]) - /* Call - - -- --- ----- -------- */ - c__aproc0(); - --#line 4785 "critcl.tcl" -+#line 4786 "critcl.tcl" - return TCL_OK; - } -diff --git test/cproc/2.1 test/cproc/2.1 -index 7b286a4..840fcf7 100644 ---- test/cproc/2.1 -+++ test/cproc/2.1 -@@ -18,6 +18,6 @@ tcl__the_aproc0(ClientData cd, Tcl_Interp *interp, int oc, Tcl_Obj *CONST ov[]) - /* Call - - -- --- ----- -------- */ - c__the_aproc0(); - --#line 4785 "critcl.tcl" -+#line 4786 "critcl.tcl" - return TCL_OK; - } -diff --git test/cproc/2.2 test/cproc/2.2 -index 25a8818..d32df4d 100644 ---- test/cproc/2.2 -+++ test/cproc/2.2 -@@ -18,6 +18,6 @@ tcl__aproc_beta0(ClientData cd, Tcl_Interp *interp, int oc, Tcl_Obj *CONST ov[]) - /* Call - - -- --- ----- -------- */ - c__aproc_beta0(); - --#line 4785 "critcl.tcl" -+#line 4786 "critcl.tcl" - return TCL_OK; - } -diff --git test/cproc/2.3 test/cproc/2.3 -index fa65bc4..fde9cdb 100644 ---- test/cproc/2.3 -+++ test/cproc/2.3 -@@ -17,6 +17,6 @@ snafu(ClientData cd, Tcl_Interp *interp, int oc, Tcl_Obj *CONST ov[]) - /* Call - - -- --- ----- -------- */ - c_snafu(); - --#line 4785 "critcl.tcl" -+#line 4786 "critcl.tcl" - return TCL_OK; - } -diff --git test/cproc/2.4 test/cproc/2.4 -index 719843b..21ffd59 100644 ---- test/cproc/2.4 -+++ test/cproc/2.4 -@@ -18,6 +18,6 @@ tcl__aproc0(ClientData cd, Tcl_Interp *interp, int oc, Tcl_Obj *CONST ov[]) - /* Call - - -- --- ----- -------- */ - c__aproc0(cd); - --#line 4785 "critcl.tcl" -+#line 4786 "critcl.tcl" - return TCL_OK; - } -diff --git test/cproc/2.5 test/cproc/2.5 -index f342f2c..4dfb5ba 100644 ---- test/cproc/2.5 -+++ test/cproc/2.5 -@@ -18,6 +18,6 @@ tcl__aproc0(ClientData cd, Tcl_Interp *interp, int oc, Tcl_Obj *CONST ov[]) - /* Call - - -- --- ----- -------- */ - c__aproc0(); - --#line 4785 "critcl.tcl" -+#line 4786 "critcl.tcl" - return TCL_OK; - } -diff --git test/cproc/2.6 test/cproc/2.6 -index abf4d4f..e3fe32f 100644 ---- test/cproc/2.6 -+++ test/cproc/2.6 -@@ -18,12 +18,12 @@ tcl__aproc0(ClientData cd, Tcl_Interp *interp, int oc, Tcl_Obj *CONST ov[]) - - /* (int anargument) - - -- --- ----- -------- */ - { --#line 4699 "critcl.tcl" -+#line 4700 "critcl.tcl" - if (Tcl_GetIntFromObj(interp, ov[1], &_anargument) != TCL_OK) return TCL_ERROR; } - - /* Call - - -- --- ----- -------- */ - c__aproc0(_anargument); - --#line 4785 "critcl.tcl" -+#line 4786 "critcl.tcl" - return TCL_OK; - } -diff --git test/cproc/2.7 test/cproc/2.7 -index f8c438d..c7e6878 100644 ---- test/cproc/2.7 -+++ test/cproc/2.7 -@@ -21,7 +21,7 @@ tcl__aproc0(ClientData cd, Tcl_Interp *interp, int oc, Tcl_Obj *CONST ov[]) - idx_ = 1; - if (oc > 1) { - { --#line 4699 "critcl.tcl" -+#line 4700 "critcl.tcl" - if (Tcl_GetIntFromObj(interp, ov[idx_], &_anargument) != TCL_OK) return TCL_ERROR; } - idx_++; - } else { -@@ -31,6 +31,6 @@ tcl__aproc0(ClientData cd, Tcl_Interp *interp, int oc, Tcl_Obj *CONST ov[]) - /* Call - - -- --- ----- -------- */ - c__aproc0(_anargument); - --#line 4785 "critcl.tcl" -+#line 4786 "critcl.tcl" - return TCL_OK; - } -diff --git test/cproc/2.9 test/cproc/2.9 -index f11ca08..001a5c8 100644 ---- test/cproc/2.9 -+++ test/cproc/2.9 -@@ -18,7 +18,7 @@ tcl__aproc0(ClientData cd, Tcl_Interp *interp, int oc, Tcl_Obj *CONST ov[]) - /* Call - - -- --- ----- -------- */ - rv = c__aproc0(); - --#line 4793 "critcl.tcl" -+#line 4794 "critcl.tcl" - Tcl_SetObjResult(interp, Tcl_NewIntObj(rv)); - return TCL_OK; - } Property changes on: head/devel/critcl/files/patch-tests ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/critcl/files/patch-lib_critcl_critcl.tcl =================================================================== --- head/devel/critcl/files/patch-lib_critcl_critcl.tcl (nonexistent) +++ head/devel/critcl/files/patch-lib_critcl_critcl.tcl (revision 405408) @@ -0,0 +1,24 @@ +--- lib/critcl/critcl.tcl.orig 2015-05-28 04:45:02 UTC ++++ lib/critcl/critcl.tcl +@@ -604,7 +604,8 @@ proc ::critcl::cconst {name rtype rvalue + # funciton body. + + SkipIgnored [set file [This]] +- AbortWhenCalledAfterBuild ++ # https://github.com/andreas-kupries/critcl/commit/4f20732 ++ HandleDeclAfterBuild + + # A void result does not make sense for constants. + if {$rtype eq "void"} { +@@ -4514,7 +4515,10 @@ proc ::critcl::Cat {path} { + # Easier to write our own copy than requiring fileutil and then + # using fileutil::cat. + +- set fd [open $path r] ++ # https://github.com/andreas-kupries/critcl/pull/61 ++ if {[catch {set fd [open $path r]} err]} { ++ return ++ } + set data [read $fd] + close $fd + return $data Property changes on: head/devel/critcl/files/patch-lib_critcl_critcl.tcl ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/critcl/files/patch-test_cconst.test =================================================================== --- head/devel/critcl/files/patch-test_cconst.test (nonexistent) +++ head/devel/critcl/files/patch-test_cconst.test (revision 405408) @@ -0,0 +1,13 @@ +--- test/cconst.test.orig 2015-05-28 04:45:02 UTC ++++ test/cconst.test +@@ -23,6 +23,10 @@ support { + } + testing { + useLocal lib/critcl/critcl.tcl critcl ++ ++ # Note: The next command does not influence the standard argument- ++ # and result-types. ++ critcl::config lines 0 + } + + # ------------------------------------------------------------------------- Property changes on: head/devel/critcl/files/patch-test_cconst.test ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/critcl/pkg-plist =================================================================== --- head/devel/critcl/pkg-plist (revision 405407) +++ head/devel/critcl/pkg-plist (revision 405408) @@ -1,117 +1,120 @@ bin/critcl lib/critcl-app%%VER%%/critcl.tcl lib/critcl-app%%VER%%/pkgIndex.tcl lib/critcl-app%%VER%%/runtime.tcl lib/critcl-app%%VER%%/tea/Config.in lib/critcl-app%%VER%%/tea/Makefile.in lib/critcl-app%%VER%%/tea/aclocal.m4 lib/critcl-app%%VER%%/tea/configure.in lib/critcl-app%%VER%%/tea/tclconfig/README.txt lib/critcl-app%%VER%%/tea/tclconfig/install-sh lib/critcl-app%%VER%%/tea/tclconfig/tcl.m4 lib/critcl-bitmap1.0.1/bitmap.tcl lib/critcl-bitmap1.0.1/pkgIndex.tcl lib/critcl-class1.0.6/class.h lib/critcl-class1.0.6/class.tcl lib/critcl-class1.0.6/pkgIndex.tcl -lib/critcl-enum1/enum.tcl -lib/critcl-enum1/pkgIndex.tcl -lib/critcl-iassoc1.0.1/iassoc.h -lib/critcl-iassoc1.0.1/iassoc.tcl -lib/critcl-iassoc1.0.1/pkgIndex.tcl +lib/critcl-emap1/emap.tcl +lib/critcl-emap1/pkgIndex.tcl +lib/critcl-enum1.0.1/enum.tcl +lib/critcl-enum1.0.1/pkgIndex.tcl +lib/critcl-iassoc1.0.2/iassoc.h +lib/critcl-iassoc1.0.2/iassoc.tcl +lib/critcl-iassoc1.0.2/pkgIndex.tcl lib/critcl-literals1.1/literals.tcl lib/critcl-literals1.1/pkgIndex.tcl lib/critcl-platform/pkgIndex.tcl lib/critcl-platform/platform.tcl lib/critcl-platform/shell.tcl -lib/critcl-util1/pkgIndex.tcl -lib/critcl-util1/util.tcl +lib/critcl-util1.1/pkgIndex.tcl +lib/critcl-util1.1/util.tcl lib/critcl%%VER%%/Config +lib/critcl%%VER%%/Config.bak +lib/critcl%%VER%%/Config.orig lib/critcl%%VER%%/critcl.tcl lib/critcl%%VER%%/critcl_c/cdata.c lib/critcl%%VER%%/critcl_c/header.c lib/critcl%%VER%%/critcl_c/pkginit.c lib/critcl%%VER%%/critcl_c/pkginitend.c lib/critcl%%VER%%/critcl_c/pkginittk.c lib/critcl%%VER%%/critcl_c/preload.c lib/critcl%%VER%%/critcl_c/stubs.c lib/critcl%%VER%%/critcl_c/stubs_e.c lib/critcl%%VER%%/critcl_c/tcl8.4/X11/X.h lib/critcl%%VER%%/critcl_c/tcl8.4/X11/Xatom.h lib/critcl%%VER%%/critcl_c/tcl8.4/X11/Xfuncproto.h lib/critcl%%VER%%/critcl_c/tcl8.4/X11/Xlib.h lib/critcl%%VER%%/critcl_c/tcl8.4/X11/Xutil.h lib/critcl%%VER%%/critcl_c/tcl8.4/X11/cursorfont.h lib/critcl%%VER%%/critcl_c/tcl8.4/X11/keysym.h lib/critcl%%VER%%/critcl_c/tcl8.4/X11/keysymdef.h lib/critcl%%VER%%/critcl_c/tcl8.4/X11/tkIntXlibDecls.h lib/critcl%%VER%%/critcl_c/tcl8.4/tcl.h lib/critcl%%VER%%/critcl_c/tcl8.4/tclDecls.h lib/critcl%%VER%%/critcl_c/tcl8.4/tclPlatDecls.h lib/critcl%%VER%%/critcl_c/tcl8.4/tk.h lib/critcl%%VER%%/critcl_c/tcl8.4/tkDecls.h lib/critcl%%VER%%/critcl_c/tcl8.4/tkPlatDecls.h lib/critcl%%VER%%/critcl_c/tcl8.5/X11/X.h lib/critcl%%VER%%/critcl_c/tcl8.5/X11/Xatom.h lib/critcl%%VER%%/critcl_c/tcl8.5/X11/Xfuncproto.h lib/critcl%%VER%%/critcl_c/tcl8.5/X11/Xlib.h lib/critcl%%VER%%/critcl_c/tcl8.5/X11/Xutil.h lib/critcl%%VER%%/critcl_c/tcl8.5/X11/cursorfont.h lib/critcl%%VER%%/critcl_c/tcl8.5/X11/keysym.h lib/critcl%%VER%%/critcl_c/tcl8.5/X11/keysymdef.h -lib/critcl%%VER%%/critcl_c/tcl8.5/X11/tk.h lib/critcl%%VER%%/critcl_c/tcl8.5/X11/tkIntXlibDecls.h lib/critcl%%VER%%/critcl_c/tcl8.5/tcl.h lib/critcl%%VER%%/critcl_c/tcl8.5/tclDecls.h lib/critcl%%VER%%/critcl_c/tcl8.5/tclPlatDecls.h lib/critcl%%VER%%/critcl_c/tcl8.5/tk.h lib/critcl%%VER%%/critcl_c/tcl8.5/tkDecls.h lib/critcl%%VER%%/critcl_c/tcl8.5/tkPlatDecls.h lib/critcl%%VER%%/critcl_c/tcl8.6/X11/X.h lib/critcl%%VER%%/critcl_c/tcl8.6/X11/Xatom.h lib/critcl%%VER%%/critcl_c/tcl8.6/X11/Xfuncproto.h lib/critcl%%VER%%/critcl_c/tcl8.6/X11/Xlib.h lib/critcl%%VER%%/critcl_c/tcl8.6/X11/Xutil.h lib/critcl%%VER%%/critcl_c/tcl8.6/X11/cursorfont.h lib/critcl%%VER%%/critcl_c/tcl8.6/X11/keysym.h lib/critcl%%VER%%/critcl_c/tcl8.6/X11/keysymdef.h -lib/critcl%%VER%%/critcl_c/tcl8.6/X11/tk.h lib/critcl%%VER%%/critcl_c/tcl8.6/X11/tkIntXlibDecls.h lib/critcl%%VER%%/critcl_c/tcl8.6/tcl.h lib/critcl%%VER%%/critcl_c/tcl8.6/tclDecls.h lib/critcl%%VER%%/critcl_c/tcl8.6/tclPlatDecls.h lib/critcl%%VER%%/critcl_c/tcl8.6/tk.h lib/critcl%%VER%%/critcl_c/tcl8.6/tkDecls.h lib/critcl%%VER%%/critcl_c/tcl8.6/tkPlatDecls.h lib/critcl%%VER%%/critcl_c/tclAppInit.c lib/critcl%%VER%%/critcl_c/tkstubs.c lib/critcl%%VER%%/license.terms lib/critcl%%VER%%/pkgIndex.tcl lib/stubs/container.tcl lib/stubs/gen_decl.tcl lib/stubs/gen_header.tcl lib/stubs/gen_init.tcl lib/stubs/gen_lib.tcl lib/stubs/gen_macro.tcl lib/stubs/gen_slot.tcl lib/stubs/genframe.tcl lib/stubs/pkgIndex.tcl lib/stubs/reader.tcl lib/stubs/writer.tcl lib/util84/dict.tcl lib/util84/lassign.tcl lib/util84/pkgIndex.tcl man/mann/critcl_app.n.gz man/mann/critcl_apppkg.n.gz man/mann/critcl_bitmap.n.gz man/mann/critcl_class.n.gz man/mann/critcl_devguide.n.gz +man/mann/critcl_emap.n.gz man/mann/critcl_enum.n.gz man/mann/critcl_iassoc.n.gz man/mann/critcl_installer.n.gz man/mann/critcl_introduction.n.gz man/mann/critcl_literals.n.gz man/mann/critcl_pkg.n.gz man/mann/critcl_sources.n.gz man/mann/critcl_usingit.n.gz man/mann/critcl_util.n.gz