lang/itcl, x11-toolkits/itk: unbreak and update

PR:		268774

6 files changed, 23 insertions, 44 deletions

diff --git a/lang/itcl/Makefile b/lang/itcl/Makefile
index d8bf663057cd..0f539d6d8dd9 100644
--- a/lang/itcl/Makefile
+++ b/lang/itcl/Makefile
@@ -1,16 +1,16 @@
 PORTNAME=	itcl
-PORTVERSION=	3.4.1
-PORTREVISION=	1
+PORTVERSION=	3.4.4
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	lang tcl
-MASTER_SITES=	SF/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4.1
+MASTER_SITES=	SF/incrtcl/%5BIncr%20Tcl_Tk%5D-source/itcl%203.4.4
 DISTNAME=	itcl${PORTVERSION}
 
 MAINTAINER=	erik@bz.bzflag.bz
 COMMENT=	Object-oriented extension to Tcl [incr Tcl]
 WWW=		https://sourceforge.net/projects/incrtcl/
 
-USES+=		tcl:tea
+USES+=		tcl:85,86,tea
 
 USE_LDCONFIG=	${PREFIX}/lib/itcl${PORTVERSION:R}
 
@@ -30,12 +30,10 @@ post-patch:
 	    ${WRKSRC}/${CONFIGURE_SCRIPT}
 
 post-install:
-	${LN} -s libitcl.so.1 \
-	    ${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PORTVERSION:R}/libitcl${PORTVERSION:R:S/.//}.so
-	${LN} -s ${PORTNAME}${PORTVERSION:R}/libitcl.so.1 \
-	    ${STAGEDIR}${PREFIX}/lib/libitcl.so.${PORTVERSION:R:R}
-	${LN} -s ${PORTNAME}${PORTVERSION:R}/libitcl.so.1 \
-	    ${STAGEDIR}${PREFIX}/lib/libitcl.so
+	${LN} -s itcl${PORTVERSION:R}/libitcl${PORTVERSION:R}.so \
+		${STAGEDIR}${PREFIX}/lib/libitcl.so.${PORTVERSION:R:R}
+	${LN} -s itcl${PORTVERSION:R}/libitcl${PORTVERSION:R}.so \
+		${STAGEDIR}${PREFIX}/lib/libitcl.so
 
 .for FILE in ${MAN_3}
 	${INSTALL_DATA} ${WRKSRC}/doc/${FILE:S/Itcl_//} ${STAGEDIR}${MAN3PREFIX}/man/man3/${FILE}
diff --git a/lang/itcl/distinfo b/lang/itcl/distinfo
index 598c038cee9e..3372501463a2 100644
--- a/lang/itcl/distinfo
+++ b/lang/itcl/distinfo
@@ -1,2 +1,3 @@
-SHA256 (itcl3.4.1.tar.gz) = 5330832ce72da97610497a58eca904287d0ff91f9ec741a4e4810d5b933c8568
-SIZE (itcl3.4.1.tar.gz) = 263316
+TIMESTAMP = 1673858940
+SHA256 (itcl3.4.4.tar.gz) = 0c7450c4927b7197aec14127545638608ef6eda35a2818d744d225b50462de86
+SIZE (itcl3.4.4.tar.gz) = 271277
diff --git a/lang/itcl/pkg-plist b/lang/itcl/pkg-plist
index 7e748e526161..bb2403031889 100644
--- a/lang/itcl/pkg-plist
+++ b/lang/itcl/pkg-plist
@@ -4,9 +4,8 @@ include/itcl%%VERSION%%/itclInt.h
 include/itcl%%VERSION%%/itclIntDecls.h
 lib/itcl%%VERSION%%/itcl.tcl
 lib/itcl%%VERSION%%/itclConfig.sh
-lib/itcl%%VERSION%%/libitcl.so.1
-lib/itcl%%VERSION%%/libitcl%%SHORT%%.so
-lib/itcl%%VERSION%%/libitclstub.a
+lib/itcl%%VERSION%%/libitcl%%VERSION%%.so
+lib/itcl%%VERSION%%/libitclstub%%VERSION%%.a
 lib/itcl%%VERSION%%/pkgIndex.tcl
 lib/libitcl.so
 lib/libitcl.so.%%MAJOR%%
diff --git a/x11-toolkits/itk/Makefile b/x11-toolkits/itk/Makefile
index 105b4552cb96..b0dc7654de48 100644
--- a/x11-toolkits/itk/Makefile
+++ b/x11-toolkits/itk/Makefile
@@ -1,8 +1,8 @@
 PORTNAME=	itk
-PORTVERSION=	3.3
-PORTREVISION=	3
+PORTVERSION=	3.4.2
+PORTREVISION=	0
 CATEGORIES=	x11-toolkits tk
-MASTER_SITES=	SF/incrtcl/%5BIncr%20Tcl_Tk%5D-source/${PORTVERSION}-RC
+MASTER_SITES=	SF/incrtcl/%5BIncr%20Tcl_Tk%5D-source/Itk%20${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	erik@bz.bzflag.bz
@@ -11,8 +11,9 @@ WWW=		https://sourceforge.net/projects/incrtcl/
 
 LIB_DEPENDS=	libitcl.so.${MAJOR}:lang/itcl
 
-USES=		tk uidfix
+USES=		tk:85,86 uidfix
 USE_LDCONFIG=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION:R}
 MAKE_ENV+=	${PLIST_SUB} \
 		SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} \
 		TK_SHLIB_VER=${TK_SHLIB_VER} TCL_INCLUDEDIR=${TCL_INCLUDEDIR} \
@@ -21,8 +22,8 @@ MAKE_ENV+=	${PLIST_SUB} \
 MAKEFILE=	${FILESDIR}/Makefile.lib
 SHLIB_MAJOR=	${MAJOR}
 SHLIB_MINOR=	${MINOR}
-MAJOR=		${PORTVERSION:R}
-MINOR=		${PORTVERSION:E}
+MAJOR=		${PORTVERSION:R:R}
+MINOR=		${PORTVERSION:R:E}
 PLIST_SUB+=	MAJOR=${MAJOR} MINOR=${MINOR}
 ITK_LIB=	libitk.so.${MAJOR}
 
diff --git a/x11-toolkits/itk/distinfo b/x11-toolkits/itk/distinfo
index 61f2c74c68a4..1ab535b2c67d 100644
--- a/x11-toolkits/itk/distinfo
+++ b/x11-toolkits/itk/distinfo
@@ -1,2 +1,3 @@
-SHA256 (itk3.3.tar.gz) = b6eee1eab759e2dc216278800624a73239ced697400bc0de4f45a4f8cd1e9ad6
-SIZE (itk3.3.tar.gz) = 211722
+TIMESTAMP = 1673859407
+SHA256 (itk3.4.2.tar.gz) = 8e5746de402d4ac9920f35793a1d328cf084b0c3d6af8b057e00fd37c82ad2ec
+SIZE (itk3.4.2.tar.gz) = 185468
diff --git a/x11-toolkits/itk/files/patch-nointerptest b/x11-toolkits/itk/files/patch-nointerptest
deleted file mode 100644
index c02bd7c4cd8d..000000000000
--- a/x11-toolkits/itk/files/patch-nointerptest
+++ /dev/null
@@ -1,21 +0,0 @@
---- tests/interp.test	Wed Sep 22 05:37:08 2004
-+++ tests/interp.test	Tue May 16 16:27:54 2006
-@@ -32,11 +32,11 @@
- } {::itk {}}
- 
--test interp-1.2 {can't load [incr Tk] into a safe interp} {
--    interp create -safe slave
--    load "" Itcl slave
--    set result [list [catch {load "" Itk slave} msg] $msg]
--    interp delete slave
--    set result
--} {1 {can't use package in a safe interpreter: no Itk_SafeInit procedure}}
-+# test interp-1.2 {can't load [incr Tk] into a safe interp} {
-+#    interp create -safe slave
-+#    load "" Itcl slave
-+#    set result [list [catch {load "" Itk slave} msg] $msg]
-+#    interp delete slave
-+#    set result
-+#} {1 {can't use package in a safe interpreter: no Itk_SafeInit procedure}}
- 
- test interp-1.3 {errors are okay when slave interp is deleted} {