devel/critcl: update to 3.2

Release notes: https://sourceforge.net/p/tcl/mailman/message/37749353/

4 files changed, 65 insertions, 80 deletions

diff --git a/devel/critcl/Makefile b/devel/critcl/Makefile
index d41c00ad073c..fc6e497f9e93 100644
--- a/devel/critcl/Makefile
+++ b/devel/critcl/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	critcl
-PORTVERSION=	3.1.18.1
-PORTREVISION=	1
+PORTVERSION=	3.2
+PORTREVISION=	0
 CATEGORIES=	devel
 
 MAINTAINER=	tcltk@FreeBSD.org
@@ -17,13 +17,13 @@ BROKEN_riscv64=		fails to package: callback.so: no such file or directory
 RUN_DEPENDS=	${LOCALBASE}/lib/Trf/pkgIndex.tcl:devel/tcl-trf	\
 		${LOCALBASE}/lib/tcllib/cmdline/pkgIndex.tcl:devel/tcllib
 
-USES+=		tcl
+USES+=		tcl:86+
 USE_GITHUB=	yes
 GH_ACCOUNT=	andreas-kupries
 
 TEST_TARGET=	test
 
-PLIST_SUB+=	VER=${PORTVERSION:R} \
+PLIST_SUB+=	VER=${PORTVERSION} \
 		ARCH=${ARCH:C/arm.*/arm/:S/i386/ix86/:S/aarch64/arm/:S/mips64/mips/:C/powerpc64.*/powerpc/}
 PORTDOCS=	*
 
@@ -36,7 +36,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} && ${TCLSH} build.tcl install --prefix ${PREFIX} --exec-prefix ${PREFIX} --dest-dir ${STAGEDIR})
 	${INSTALL_MAN} ${WRKSRC}/embedded/man/files/critcl_*.n	\
 		${STAGEDIR}${MANPREFIX}/man/mann/
 
diff --git a/devel/critcl/distinfo b/devel/critcl/distinfo
index a19682cb7e35..2a0becb1a430 100644
--- a/devel/critcl/distinfo
+++ b/devel/critcl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1582104560
-SHA256 (andreas-kupries-critcl-3.1.18.1_GH0.tar.gz) = 51bc4b099ecf59ba3bada874fc8e1611279dfd30ad4d4074257084763c49fd86
-SIZE (andreas-kupries-critcl-3.1.18.1_GH0.tar.gz) = 1825576
+TIMESTAMP = 1673261741
+SHA256 (andreas-kupries-critcl-3.2_GH0.tar.gz) = 20061944e28dda4ab2098b8f77682cab77973f8961f6fa60b95bcc09a546789e
+SIZE (andreas-kupries-critcl-3.2_GH0.tar.gz) = 1628898
diff --git a/devel/critcl/files/patch-lib_critcl_critcl.tcl b/devel/critcl/files/patch-lib_critcl_critcl.tcl
deleted file mode 100644
index 18ff9f5ac859..000000000000
--- a/devel/critcl/files/patch-lib_critcl_critcl.tcl
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
-     }
- 
diff --git a/devel/critcl/pkg-plist b/devel/critcl/pkg-plist
index 1b697bc3e503..8b637488db63 100644
--- a/devel/critcl/pkg-plist
+++ b/devel/critcl/pkg-plist
@@ -13,29 +13,29 @@ 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.1.1/class.h
-lib/critcl-class1.1.1/class.tcl
-lib/critcl-class1.1.1/pkgIndex.tcl
-lib/critcl-cutil0.2/allocs/critcl_alloc.h
-lib/critcl-cutil0.2/asserts/critcl_assert.h
-lib/critcl-cutil0.2/cutil.tcl
-lib/critcl-cutil0.2/pkgIndex.tcl
-lib/critcl-cutil0.2/trace/critcl_trace.h
-lib/critcl-cutil0.2/trace/trace.c
-lib/critcl-emap1.2/emap.tcl
-lib/critcl-emap1.2/pkgIndex.tcl
-lib/critcl-enum1.1/enum.tcl
-lib/critcl-enum1.1/pkgIndex.tcl
-lib/critcl-iassoc1.1/iassoc.tcl
-lib/critcl-iassoc1.1/pkgIndex.tcl
-lib/critcl-literals1.3/literals.tcl
-lib/critcl-literals1.3/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-bitmap1.1/bitmap.tcl
+lib/critcl-bitmap1.1/pkgIndex.tcl
+lib/critcl-class1.2/class.h
+lib/critcl-class1.2/class.tcl
+lib/critcl-class1.2/pkgIndex.tcl
+lib/critcl-cutil0.3/allocs/critcl_alloc.h
+lib/critcl-cutil0.3/asserts/critcl_assert.h
+lib/critcl-cutil0.3/cutil.tcl
+lib/critcl-cutil0.3/pkgIndex.tcl
+lib/critcl-cutil0.3/trace/critcl_trace.h
+lib/critcl-cutil0.3/trace/trace.c
+lib/critcl-emap1.3/emap.tcl
+lib/critcl-emap1.3/pkgIndex.tcl
+lib/critcl-enum1.2/enum.tcl
+lib/critcl-enum1.2/pkgIndex.tcl
+lib/critcl-iassoc1.2/iassoc.tcl
+lib/critcl-iassoc1.2/pkgIndex.tcl
+lib/critcl-literals1.4/literals.tcl
+lib/critcl-literals1.4/pkgIndex.tcl
+lib/critcl-platform1.1/pkgIndex.tcl
+lib/critcl-platform1.1/platform.tcl
+lib/critcl-util1.2/pkgIndex.tcl
+lib/critcl-util1.2/util.tcl
 lib/critcl%%VER%%/Config
 lib/critcl%%VER%%/Config.bak
 lib/critcl%%VER%%/Config.orig
@@ -99,57 +99,53 @@ 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/critcl_callback1/critcl-rt.tcl
-lib/critcl_callback1/freebsd-%%ARCH%%/callback.so
-lib/critcl_callback1/license.terms
-lib/critcl_callback1/pkgIndex.tcl
-lib/critcl_callback1/teapot.txt
+lib/critcl_callback1.1/critcl-rt.tcl
+lib/critcl_callback1.1/freebsd-%%ARCH%%/callback.so
+lib/critcl_callback1.1/license.terms
+lib/critcl_callback1.1/pkgIndex.tcl
+lib/critcl_callback1.1/teapot.txt
 lib/critcl_md5c0.12/critcl-rt.tcl
 lib/critcl_md5c0.12/freebsd-%%ARCH%%/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
+lib/stubs_container1.1/container.tcl
+lib/stubs_container1.1/pkgIndex.tcl
+lib/stubs_gen_decl1.1/gen_decl.tcl
+lib/stubs_gen_decl1.1/pkgIndex.tcl
+lib/stubs_gen_header1.1/gen_header.tcl
+lib/stubs_gen_header1.1/pkgIndex.tcl
+lib/stubs_gen_init1.1/gen_init.tcl
+lib/stubs_gen_init1.1/pkgIndex.tcl
+lib/stubs_gen_lib1.1/gen_lib.tcl
+lib/stubs_gen_lib1.1/pkgIndex.tcl
+lib/stubs_gen_macro1.1/gen_macro.tcl
+lib/stubs_gen_macro1.1/pkgIndex.tcl
+lib/stubs_gen_slot1.1/gen_slot.tcl
+lib/stubs_gen_slot1.1/pkgIndex.tcl
+lib/stubs_genframe1.1/genframe.tcl
+lib/stubs_genframe1.1/pkgIndex.tcl
+lib/stubs_reader1.1/pkgIndex.tcl
+lib/stubs_reader1.1/reader.tcl
+lib/stubs_writer1.1/pkgIndex.tcl
+lib/stubs_writer1.1/writer.tcl
+man/mann/critcl_application.n.gz
+man/mann/critcl_application_package.n.gz
 man/mann/critcl_bitmap.n.gz
+man/mann/critcl_build.n.gz
 man/mann/critcl_callback.n.gz
+man/mann/critcl_changes.n.gz
 man/mann/critcl_class.n.gz
 man/mann/critcl_cproc.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_howto_install.n.gz
+man/mann/critcl_howto_sources.n.gz
+man/mann/critcl_howto_use.n.gz
 man/mann/critcl_iassoc.n.gz
-man/mann/critcl_installer.n.gz
-man/mann/critcl_introduction.n.gz
+man/mann/critcl_license.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_package.n.gz
 man/mann/critcl_util.n.gz