Date: Wed, 29 Apr 2020 08:49:05 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r533328 - in head/devel/critcl: . files Message-ID: <202004290849.03T8n5vw036047@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Wed Apr 29 08:49:04 2020 New Revision: 533328 URL: https://svnweb.freebsd.org/changeset/ports/533328 Log: devel/critcl: fix build-as-user, ignore our compilers in targetplatform Added: head/devel/critcl/files/patch-lib_app-critcl_critcl.tcl (contents, props changed) head/devel/critcl/files/patch-lib_critcl_critcl.tcl (contents, props changed) Modified: head/devel/critcl/Makefile head/devel/critcl/files/patch-build.tcl Modified: head/devel/critcl/Makefile ============================================================================== --- head/devel/critcl/Makefile Wed Apr 29 08:42:31 2020 (r533327) +++ head/devel/critcl/Makefile Wed Apr 29 08:49:04 2020 (r533328) @@ -3,7 +3,7 @@ PORTNAME= critcl PORTVERSION= 3.1.18.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= tcltk@FreeBSD.org @@ -21,6 +21,7 @@ USES+= tcl USE_GITHUB= yes GH_ACCOUNT= andreas-kupries +MAKE_ENV= CRITCL_HOME=${WRKDIR} TEST_TARGET= test PLIST_SUB+= VER=${PORTVERSION:R} \ @@ -36,7 +37,7 @@ post-patch: ${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/ Modified: head/devel/critcl/files/patch-build.tcl ============================================================================== --- head/devel/critcl/files/patch-build.tcl Wed Apr 29 08:42:31 2020 (r533327) +++ head/devel/critcl/files/patch-build.tcl Wed Apr 29 08:49:04 2020 (r533328) @@ -1,8 +1,8 @@ ---- 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 {}} { Added: head/devel/critcl/files/patch-lib_app-critcl_critcl.tcl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/critcl/files/patch-lib_app-critcl_critcl.tcl Wed Apr 29 08:49:04 2020 (r533328) @@ -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 {} { Added: head/devel/critcl/files/patch-lib_critcl_critcl.tcl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/critcl/files/patch-lib_critcl_critcl.tcl Wed Apr 29 08:49:04 2020 (r533328) @@ -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 + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004290849.03T8n5vw036047>