svn commit: r533330 - in head/devel/critcl: . files

[Pietro Cerutti]

Author: gahr
Date: Wed Apr 29 10:00:26 2020
New Revision: 533330
URL: https://svnweb.freebsd.org/changeset/ports/533330

Log:
  devel/critcl: better fix for build-as-user

Deleted:
  head/devel/critcl/files/patch-lib_app-critcl_critcl.tcl
Modified:
  head/devel/critcl/Makefile
  head/devel/critcl/files/patch-build.tcl

Modified: head/devel/critcl/Makefile
==============================================================================
--- head/devel/critcl/Makefile	Wed Apr 29 09:32:34 2020	(r533329)
+++ head/devel/critcl/Makefile	Wed Apr 29 10:00:26 2020	(r533330)
@@ -21,7 +21,6 @@ USES+=		tcl
 USE_GITHUB=	yes
 GH_ACCOUNT=	andreas-kupries
 
-MAKE_ENV=	CRITCL_HOME=${WRKDIR}
 TEST_TARGET=	test
 
 PLIST_SUB+=	VER=${PORTVERSION:R} \
@@ -37,7 +36,7 @@ post-patch:
 	${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g' ${WRKSRC}/lib/critcl/Config
 
 do-install:
-	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${TCLSH} build.tcl install ${STAGEDIR}${PREFIX}/lib)
+	(cd ${WRKSRC} && ${TCLSH} build.tcl install ${STAGEDIR}${PREFIX}/lib)
 	${INSTALL_MAN} ${WRKSRC}/embedded/man/files/critcl_*.n	\
 		${STAGEDIR}${MANPREFIX}/man/mann/
 

Modified: head/devel/critcl/files/patch-build.tcl
==============================================================================
--- head/devel/critcl/files/patch-build.tcl	Wed Apr 29 09:32:34 2020	(r533329)
+++ head/devel/critcl/files/patch-build.tcl	Wed Apr 29 10:00:26 2020	(r533330)
@@ -1,6 +1,14 @@
---- build.tcl.orig	2020-02-19 04:07:06 UTC
-+++ build.tcl
-@@ -507,6 +507,7 @@ proc _install {args} {
+--- build.tcl.orig	2020-02-19 04:07:06.000000000 +0000
++++ build.tcl	2020-04-29 09:52:24.419446000 +0000
+@@ -507,6 +507,7 @@
+ 	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
+ 	}
+@@ -541,6 +542,7 @@
  	lappend cmd exec >@ stdout 2>@ stderr
  	lappend cmd [info nameofexecutable]
  	lappend cmd $theapp