From nobody Mon Jan 16 10:03:07 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NwSJW50z9z2ttBp; Mon, 16 Jan 2023 10:03:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NwSJW4SXsz3rqQ; Mon, 16 Jan 2023 10:03:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673863387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2ZSSN7mh8xy7YD8x6bYjTzkkjpJMeRp/NEBYQ7kgRl8=; b=A1bB/Olhp/bfAb/+WwJZUO3YBl8vRaD8FAPJXgGS4V7whEACQkAqMY7URtTL1lFC5UBYgQ vK/ZablFfb/wpdxCU13YXVcJhkWkR3WWNoZeHET+nR2JBqWrI4LyQ7Bmalek8U3m7XGXYZ VjzX7nigQybsQjcFIJefM9Z+7swxhO598QpSw8SZuBo4eOTAeas+SgCyyCiAO6GS/eJa2T hUisSOJTBWaTR9OK/aDcYgIOgcYvF/r1sstU0MbZRsyt3TYwk/osQj0jeQpKhd56tJqU2g TP8catOPcUsSA290FHfjkUD91KNpfJh7+zR9+FJ07JQi5QE0obO1RxZduHJrow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673863387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2ZSSN7mh8xy7YD8x6bYjTzkkjpJMeRp/NEBYQ7kgRl8=; b=MGfNRDKE32SZnLiaXOYLlIvc7tso5Rpgxu/yrrPbhVcEwlj0DDR+bFd+ffXvYnVIOLNwsG okb8ibrICswq1ne1wXiFBmTIWxilVipqV3m80XGaqjTTOna8gEYgMaCK3Z3kA1ousQrkjm j2zIVYOQoPJ3/gpC4YqByPmeMDHYqxITwh2lNx6PonPXpGrFiH2RplXIzvIMulveMDq6WQ KE9/gp4hKehWmroBqjs3GRB6XUyzD5XcrfKwtx6jaENZgbpD3pLwdCWdolUpNqud/AE6i/ dYNWqKT/NXGWe7T3k9zj1oQGdBqz6f5Vyv0nbockpMCL8uiLV/uAbbeEUY/pkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673863387; a=rsa-sha256; cv=none; b=yd3cN1AKGkElbHziuNjthhnyoBSnzyGeXHWnXHPO2R2fyGSf1V+wZ6/oNgkVY2EY0s0tkE gr46H/A+gyIaUM45jUbvUx7p8PWvI8v/DGSENxueZrqhOM7CJogtz2JvWXNgDxA7Wy0q5Z 76lKHLtpS7N6FOLvMGi3xJROdU92hhEixikj9Gwst3LEzif4QBFRPQ7MUOo7L3VmfC55Pb oqmW36dTK4Kf1PfD/z50Ybg/0XzcyxeKdkF2PIV+qbrbN53DzflRpA1lz8duvZYdXCB91q hAymQaqBxgae2zZz3bTNuxisiSFe25VbjxJvfYlAoo7UQ3FzElPFJJE1x0c3nQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NwSJW3Vklz134s; Mon, 16 Jan 2023 10:03:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30GA37fJ063058; Mon, 16 Jan 2023 10:03:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30GA37qe063057; Mon, 16 Jan 2023 10:03:07 GMT (envelope-from git) Date: Mon, 16 Jan 2023 10:03:07 GMT Message-Id: <202301161003.30GA37qe063057@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Pietro Cerutti Subject: git: d03240afda91 - main - lang/itcl, x11-toolkits/itk: unbreak and update List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gahr X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d03240afda91c970ace4b2fb5d6c86724e8a0b58 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gahr: URL: https://cgit.FreeBSD.org/ports/commit/?id=d03240afda91c970ace4b2fb5d6c86724e8a0b58 commit d03240afda91c970ace4b2fb5d6c86724e8a0b58 Author: Pietro Cerutti AuthorDate: 2023-01-16 09:59:00 +0000 Commit: Pietro Cerutti CommitDate: 2023-01-16 10:02:10 +0000 lang/itcl, x11-toolkits/itk: unbreak and update PR: 268774 --- lang/itcl/Makefile | 18 ++++++++---------- lang/itcl/distinfo | 5 +++-- lang/itcl/pkg-plist | 5 ++--- x11-toolkits/itk/Makefile | 13 +++++++------ x11-toolkits/itk/distinfo | 5 +++-- x11-toolkits/itk/files/patch-nointerptest | 21 --------------------- 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} {