Index: head/devel/critcl/Makefile =================================================================== --- head/devel/critcl/Makefile (revision 450235) +++ head/devel/critcl/Makefile (revision 450236) @@ -1,45 +1,44 @@ # Created by: gahr@FreeBSD.org # $FreeBSD$ PORTNAME= critcl -PORTVERSION= 3.1.15 +PORTVERSION= 3.1.17 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:devel/tcl-trf \ ${LOCALBASE}/lib/tcllib/cmdline/pkgIndex.tcl:devel/tcllib 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: build - (cd ${WRKSRC} && ${TCLSH} test/all.tcl) +do-test: + (cd ${WRKSRC} && ${TCLSH} build.tcl test) .include Index: head/devel/critcl/distinfo =================================================================== --- head/devel/critcl/distinfo (revision 450235) +++ head/devel/critcl/distinfo (revision 450236) @@ -1,2 +1,3 @@ -SHA256 (andreas-kupries-critcl-3.1.15_GH0.tar.gz) = d93facfc2f1407941ee22157f08add2fdfbc5a48b9a5e1a1b8665a0af32d4ff7 -SIZE (andreas-kupries-critcl-3.1.15_GH0.tar.gz) = 1678961 +TIMESTAMP = 1505921463 +SHA256 (andreas-kupries-critcl-3.1.17_GH0.tar.gz) = d1fdb23b252280f6159df7eb3cfbda9daa61f9185b7dc881d11f0253e41a367d +SIZE (andreas-kupries-critcl-3.1.17_GH0.tar.gz) = 1744383 Index: head/devel/critcl/files/patch-build.tcl =================================================================== --- head/devel/critcl/files/patch-build.tcl (revision 450235) +++ head/devel/critcl/files/patch-build.tcl (nonexistent) @@ -1,11 +0,0 @@ ---- build.tcl.orig 2013-11-05 09:27:29.000000000 +0100 -+++ build.tcl 2013-11-05 09:28:22.000000000 +0100 -@@ -249,7 +249,7 @@ - set dsta [file dirname [file dirname [file normalize [info nameofexecutable]/___]]] - } else { - set dstl $dst -- set dsta [file dirname [findlib $dstl]]/bin -+ set dsta $dst/../bin - } - - puts {Installing into:} Property changes on: head/devel/critcl/files/patch-build.tcl ___________________________________________________________________ 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 (revision 450235) +++ head/devel/critcl/files/patch-lib_critcl_critcl.tcl (nonexistent) @@ -1,24 +0,0 @@ ---- 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 ___________________________________________________________________ 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-test_cconst.test =================================================================== --- head/devel/critcl/files/patch-test_cconst.test (revision 450235) +++ head/devel/critcl/files/patch-test_cconst.test (nonexistent) @@ -1,13 +0,0 @@ ---- 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 ___________________________________________________________________ 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/pkg-plist =================================================================== --- head/devel/critcl/pkg-plist (revision 450235) +++ head/devel/critcl/pkg-plist (revision 450236) @@ -1,120 +1,145 @@ 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-emap1/emap.tcl -lib/critcl-emap1/pkgIndex.tcl +lib/critcl-class1.0.7/class.h +lib/critcl-class1.0.7/class.tcl +lib/critcl-class1.0.7/pkgIndex.tcl +lib/critcl-cutil0.1/allocs/critcl_alloc.h +lib/critcl-cutil0.1/asserts/critcl_assert.h +lib/critcl-cutil0.1/cutil.tcl +lib/critcl-cutil0.1/pkgIndex.tcl +lib/critcl-cutil0.1/trace/critcl_trace.h +lib/critcl-cutil0.1/trace/trace.c +lib/critcl-emap1.1/emap.tcl +lib/critcl-emap1.1/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-literals1.2/literals.tcl +lib/critcl-literals1.2/pkgIndex.tcl +lib/critcl-platform1.0.15/pkgIndex.tcl +lib/critcl-platform1.0.15/platform.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/storageclass.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/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/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%%/critcl_c/tkstubs_noconst.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 +lib/critcl_md5c0.12/critcl-rt.tcl +lib/critcl_md5c0.12/freebsd-amd64/md5c.so +lib/critcl_md5c0.12/license.terms +lib/critcl_md5c0.12/pkgIndex.tcl +lib/critcl_md5c0.12/teapot.txt +lib/dict841/dict.tcl +lib/dict841/pkgIndex.tcl +lib/lassign841.0.1/lassign.tcl +lib/lassign841.0.1/pkgIndex.tcl +lib/lmap841/lmap.tcl +lib/lmap841/pkgIndex.tcl +lib/stubs_container1/container.tcl +lib/stubs_container1/pkgIndex.tcl +lib/stubs_gen_decl1/gen_decl.tcl +lib/stubs_gen_decl1/pkgIndex.tcl +lib/stubs_gen_header1/gen_header.tcl +lib/stubs_gen_header1/pkgIndex.tcl +lib/stubs_gen_init1/gen_init.tcl +lib/stubs_gen_init1/pkgIndex.tcl +lib/stubs_gen_lib1/gen_lib.tcl +lib/stubs_gen_lib1/pkgIndex.tcl +lib/stubs_gen_macro1/gen_macro.tcl +lib/stubs_gen_macro1/pkgIndex.tcl +lib/stubs_gen_slot1/gen_slot.tcl +lib/stubs_gen_slot1/pkgIndex.tcl +lib/stubs_genframe1/genframe.tcl +lib/stubs_genframe1/pkgIndex.tcl +lib/stubs_reader1/pkgIndex.tcl +lib/stubs_reader1/reader.tcl +lib/stubs_writer1/pkgIndex.tcl +lib/stubs_writer1/writer.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_cutil.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