Index: head/devel/critcl/Makefile
===================================================================
--- head/devel/critcl/Makefile	(revision 533327)
+++ head/devel/critcl/Makefile	(revision 533328)
@@ -1,46 +1,47 @@
 # Created by: gahr@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	critcl
 PORTVERSION=	3.1.18.1
-PORTREVISION=	0
+PORTREVISION=	1
 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
 USE_GITHUB=	yes
 GH_ACCOUNT=	andreas-kupries
 
+MAKE_ENV=	CRITCL_HOME=${WRKDIR}
 TEST_TARGET=	test
 
 PLIST_SUB+=	VER=${PORTVERSION:R} \
 		ARCH=${ARCH:C/arm.*/arm/:S/i386/ix86/:S/aarch64/arm/:S/mips64/mips/:S/powerpc64/powerpc/}
 PORTDOCS=	*
 
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 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
 
 do-install:
-	(cd ${WRKSRC} && ${TCLSH} build.tcl install ${STAGEDIR}${PREFIX}/lib)
+	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${TCLSH} build.tcl install ${STAGEDIR}${PREFIX}/lib)
 	${INSTALL_MAN} ${WRKSRC}/embedded/man/files/critcl_*.n	\
 		${STAGEDIR}${MANPREFIX}/man/mann/
 
 do-test:
 	(cd ${WRKSRC} && ${TCLSH} build.tcl test)
 
 .include <bsd.port.mk>
Index: head/devel/critcl/files/patch-build.tcl
===================================================================
--- head/devel/critcl/files/patch-build.tcl	(revision 533327)
+++ head/devel/critcl/files/patch-build.tcl	(revision 533328)
@@ -1,10 +1,10 @@
---- build.tcl.orig	2017-10-24 14:35:54 UTC
+--- build.tcl.orig	2020-02-19 04:07:06 UTC
 +++ build.tcl
-@@ -426,6 +426,7 @@ proc _install {args} {
- 	    lappend cmd [info nameofexecutable]
- 	}
+@@ -507,6 +507,7 @@ proc _install {args} {
+ 	lappend cmd exec >@ stdout 2>@ stderr
+ 	lappend cmd [info nameofexecutable]
  	lappend cmd $theapp
 +	lappend cmd -cache [file join $selfdir cache]
  	if {$target ne {}} {
  	    lappend cmd -target $target
  	}
Index: head/devel/critcl/files/patch-lib_app-critcl_critcl.tcl
===================================================================
--- head/devel/critcl/files/patch-lib_app-critcl_critcl.tcl	(nonexistent)
+++ head/devel/critcl/files/patch-lib_app-critcl_critcl.tcl	(revision 533328)
@@ -0,0 +1,12 @@
+--- lib/app-critcl/critcl.tcl.orig	2020-02-19 04:07:06 UTC
++++ lib/app-critcl/critcl.tcl
+@@ -174,7 +174,8 @@ proc ::critcl::app::PackageCache {} {
+     if {$v::cache ne {}} {
+ 	return $v::cache
+     }
+-    return [file join ~ .critcl pkg[pid].[clock seconds]]
++    set home [expr {[info exists ::env(CRITCL_HOME)] ? $::env(CRITCL_HOME) : {~}}]
++    return [file join $home .critcl pkg[pid].[clock seconds]]
+ }
+ 
+ proc ::critcl::app::StopOnFailed {} {

Property changes on: head/devel/critcl/files/patch-lib_app-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-lib_critcl_critcl.tcl
===================================================================
--- head/devel/critcl/files/patch-lib_critcl_critcl.tcl	(nonexistent)
+++ head/devel/critcl/files/patch-lib_critcl_critcl.tcl	(revision 533328)
@@ -0,0 +1,11 @@
+--- lib/critcl/critcl.tcl.orig	2020-04-29 08:46:32 UTC
++++ lib/critcl/critcl.tcl
+@@ -2754,7 +2754,7 @@ proc ::critcl::setconfig {targetconfig} {
+     # as well.
+ 
+     set v::targetplatform $targetconfig
+-    foreach p {gcc cc_r xlc xlc_r cc cl} {
++    foreach p {gcc cc_r xlc xlc_r cc cl clang([[:digit:]])*} {
+ 	if {[regsub -- "-$p\$" $v::targetplatform {} v::targetplatform]} break
+     }
+ 

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