From nobody Wed Jan  8 16:03:12 2025
X-Original-To: dev-commits-ports-all@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 4YSt4J53fZz5kh9J;
	Wed, 08 Jan 2025 16:03:12 +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 "R11" (verified OK))
	by mx1.freebsd.org (Postfix) with ESMTPS id 4YSt4J3sjhz4tRM;
	Wed,  8 Jan 2025 16:03:12 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
	t=1736352192;
	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=X4SsiT+OpdgqXOqUGHSSjfvVxCk6qf2fElD2g+OREBU=;
	b=Be7ckEskvFFnev9EC1Cb9k+8BF6mW9WjCKIXf8lnHTwZrQa4af/Lci1wHBK+atZeOCKgQa
	WsJ9G6j9P/br8PsGO2CR3Pa0Mt4qdpfclozJopqgCQe+ZvwvJMKKo9zSZbPcVACIHWs4VN
	5Nccc1DBuSr13X7Wu4dgChwVLq5gGQvh5XnlSzg0rzqQ1Ns6v4hSdmO/qYMc90Bw4tBP2s
	2sM2m/xd197QIWlnQ4WPOtqzM/3yGvc0rIDRXPQdnTUFA3NB3ZsLhqL9MSFvioShaOBnnn
	EZx3SZ/8rm9mWZtqoXgf7q6YXazDSWeQsPmKSNuxWAsBYrcwx7jWLw65hJRPpQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1736352192;
	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=X4SsiT+OpdgqXOqUGHSSjfvVxCk6qf2fElD2g+OREBU=;
	b=IuWk+DNgyZWH+Us6IgGvtTSuptxjIElrIDCEI1VLrfDc0syXVhB8nJQfcYoQ1gPIFAEYCr
	eXzal6XhaEVYMhJEP+lzmV6AETePbTgleIlWCh3r+2Egqz9Gt6LALOzTT6O/mc7ESxcxXI
	V2NocjULTw7u1TSjuPp64V/7hjrPuXVtofYxuzrYv/OPJflgyvT0V0KAPnz1747cPaKYFh
	+/LVkG2WV7kWYMWsVEyJVvlRcUycX47beMQ4gB/dEmF+Jqg5mCcsRyHo0DyZShoS+r9wRN
	xrRfx8OtM2MkQifSVzU4a/n1wbEupp2xlX99WxuuTIaYVZQ2M5DC33L9XXuc0g==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736352192; a=rsa-sha256; cv=none;
	b=mKNl1b64zeaVbVOV4UIGvqugV/KmnYGe2OUzZoDk5tnvHeNheWRPqvLxQoDI0fCR1xodeN
	OA0w7PZbquUFDCO21romSQfB7gJLIOhTuXg9FwJ4/XEQvRIj71zfhL0t75yhrsFI7VIAXR
	pCqQrWbKTaTHvA/03k24uhM0PxqsQw2pgBN1DRgYBeTc5bcSiCwURVhc4o546oukZLjHl9
	m40I0XzWCTfLzCHZCP7unnb9gN3sNMh9UcDKrkHlBPx3COALaUhPFCTdIigjFi/amAx6Dd
	OixX2gYPPfyQDXGZYMIZaC27PxXRtCZCT6EqdgEtdkRi2arI2UuFLLCj2bASoQ==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
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 4YSt4J38qsz13Bf;
	Wed, 08 Jan 2025 16:03:12 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
	by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 508G3Cid080545;
	Wed, 8 Jan 2025 16:03:12 GMT
	(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
	by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 508G3CZp080542;
	Wed, 8 Jan 2025 16:03:12 GMT
	(envelope-from git)
Date: Wed, 8 Jan 2025 16:03:12 GMT
Message-Id: <202501081603.508G3CZp080542@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
        dev-commits-ports-main@FreeBSD.org
From: Cy Schubert <cy@FreeBSD.org>
Subject: git: bd3a42e85f0a - main - mail/exmh2: After falling back
  to tk86 make mouse wheel work again
List-Id: Commit messages for all branches of the ports repository <dev-commits-ports-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all
List-Help: <mailto:dev-commits-ports-all+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-all+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-ports-all@freebsd.org
Sender: owner-dev-commits-ports-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: cy
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: bd3a42e85f0ab245d07c4ca0125e738cfb077574
Auto-Submitted: auto-generated

The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bd3a42e85f0ab245d07c4ca0125e738cfb077574

commit bd3a42e85f0ab245d07c4ca0125e738cfb077574
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2025-01-08 16:01:50 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2025-01-08 16:03:02 +0000

    mail/exmh2: After falling back to tk86 make mouse wheel work again
    
    Two patches specific to tk87 will not work with tk86.
    
    MFH:            2025Q1
---
 mail/exmh2/Makefile                  |  2 +-
 mail/exmh2/files/patch-lib_exwin.tcl | 35 -----------------------------------
 mail/exmh2/files/patch-lib_fdisp.tcl | 11 -----------
 3 files changed, 1 insertion(+), 47 deletions(-)

diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile
index 35a1958c9a1b..fab67fa574b7 100644
--- a/mail/exmh2/Makefile
+++ b/mail/exmh2/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	exmh
 PORTVERSION=	2.9.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES+=	mail tk
 # XXX: Standard SF fails with a hung download
 MASTER_SITES=	https://sourceforge.net/projects/${PORTNAME}/files/${PORTNAME}/${PORTVERSION}/
diff --git a/mail/exmh2/files/patch-lib_exwin.tcl b/mail/exmh2/files/patch-lib_exwin.tcl
deleted file mode 100644
index c4e739d62e0a..000000000000
--- a/mail/exmh2/files/patch-lib_exwin.tcl
+++ /dev/null
@@ -1,35 +0,0 @@
---- lib/exwin.tcl.orig	2017-11-09 20:42:24.000000000 -0800
-+++ lib/exwin.tcl	2021-09-06 06:53:11.916007000 -0700
-@@ -101,12 +101,26 @@
- }
- 
- proc mscroll {bindtag num} {
--    bind $bindtag <Button-5> [list %W yview scroll $num units]
--    bind $bindtag <Button-4> [list %W yview scroll -$num units]
--    bind $bindtag <Shift-Button-5> [list %W yview scroll 1 units]
--    bind $bindtag <Shift-Button-4> [list %W yview scroll -1 units]
--    bind $bindtag <Control-Button-5> [list %W yview scroll 1 pages]
--    bind $bindtag <Control-Button-4> [list %W yview scroll -1 pages]
-+    # Prior to tcl 8.7a5:
-+    # bind $bindtag <Button-5> [list %W yview scroll $num units]
-+    # bind $bindtag <Button-4> [list %W yview scroll -$num units]
-+    # bind $bindtag <Shift-Button-5> [list %W yview scroll 1 units]
-+    # bind $bindtag <Shift-Button-4> [list %W yview scroll -1 units]
-+    # bind $bindtag <Control-Button-5> [list %W yview scroll 1 pages]
-+    # bind $bindtag <Control-Button-4> [list %W yview scroll -1 pages]
-+
-+    # tcl 8.7a5 and later. See
-+    # https://core.tcl-lang.org/tips/doc/trunk/tip/474.md for more info:
-+    bind $bindtag <MouseWheel> [ list tk::MouseWheel %W y %D [ expr 10/-$num ] pixels ]
-+    bind $bindtag <Shift-MouseWheel> { tk::MouseWheel %W y %D -10 pixels }
-+    bind $bindtag <Control-MouseWheel> { tk::MouseWheel %W y %D -1 pixels }
-+}
-+
-+
-+proc fmscroll {bindtag num} {
-+    bind $bindtag <MouseWheel> [ list tk::MouseWheel %W y %D [ expr 200/-$num ] units ]
-+    bind $bindtag <Shift-MouseWheel> { tk::MouseWheel %W y %D [expr 200/-10 ] units }
-+    bind $bindtag <Control-MouseWheel> { tk::MouseWheel %W y %D -1 units }
- }
- 
- 
diff --git a/mail/exmh2/files/patch-lib_fdisp.tcl b/mail/exmh2/files/patch-lib_fdisp.tcl
deleted file mode 100644
index 262d80a1cf8f..000000000000
--- a/mail/exmh2/files/patch-lib_fdisp.tcl
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/fdisp.tcl.orig	2017-11-09 20:42:24.000000000 -0800
-+++ lib/fdisp.tcl	2021-09-06 06:49:07.808426000 -0700
-@@ -254,7 +254,7 @@
- 
-     # Enable wheelscroll if desired
-     if {$exwin(wheelEnabled)} {
--        mscroll $fdisp(canvas) 1
-+        fmscroll $fdisp(canvas) 5
-     }
- 
-     # fdisp popup color hack