diff --git a/mail/exmh-devel/Makefile b/mail/exmh-devel/Makefile
index 267685ec9528..05754e461dc9 100644
--- a/mail/exmh-devel/Makefile
+++ b/mail/exmh-devel/Makefile
@@ -1,70 +1,70 @@
# "+=" and "?=" lines are for sharing this Makefile with japanese/exmh2.
PORTNAME= exmh
PORTVERSION= ${COMMIT_DATE}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES+= mail tk
.if !defined(MASTERDIR)
PKGNAMESUFFIX= -devel
.endif
MAINTAINER?= cy@FreeBSD.org
COMMENT?= X11/TK based mail reader front end to MH
WWW= http://www.beedub.com/exmh/
USE_GITHUB= yes
GH_ACCOUNT= cschuber
GH_PROJECT= exmh
-GH_TAGNAME= be4b011
+GH_TAGNAME= 8b183a
COMMIT_DATE= 2022.09.28
.if defined(JAPANESE_EXMH)
RUN_DEPENDS= wish8.0jp:japanese/tk80
BUILD_DEPENDS= tclsh8.0jp:japanese/tcl80
WISH= wish8.0jp
TCLSH= tclsh8.0jp
.else
USES= cpe tk:87
.endif
# exmh is pretty useless without this, but it's not needed to build it.
.if defined(JAPANESE_EXMH)
RUN_DEPENDS+= repl:japanese/mh
.else
RUN_DEPENDS+= repl:mail/nmh
SCRIPTS_ENV+= USE_NMH=YES
.endif
# full mime support needs mmencode/mmdecode from metamail
RUN_DEPENDS+= mmencode:mail/metamail
# Additionally, exmh will use the following ports if present:
# lang/expect
# textproc/glimpse
# security/gnupg
# security/pgp
# security/pgp5
# mail/faces
# audio/rplay
PLIST_SUB= EXMH_VERSION=2.9.0
NO_ARCH= yes
.if defined(JAPANESE_EXMH)
do-build:
@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} TCLSH=${TCLSH} \
WISH=${PREFIX}/bin/${WISH} WRKSRC=${WRKSRC} \
${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/build
.else
do-build:
@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} TCLSH=${TCLSH} \
WISH=${WISH} WRKSRC=${WRKSRC} \
${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/build
.endif
do-install:
@cd ${WRKSRC} && ${SETENV} PREFIX=${STAGEDIR}${PREFIX} \
WRKSRC=${WRKSRC} ${SH} ${SCRIPTDIR}/install
.include <bsd.port.mk>
diff --git a/mail/exmh-devel/distinfo b/mail/exmh-devel/distinfo
index aa225de487dd..1a2de7f68a4b 100644
--- a/mail/exmh-devel/distinfo
+++ b/mail/exmh-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1702070915
-SHA256 (cschuber-exmh-2022.09.28-be4b011_GH0.tar.gz) = 479449564bf53c43b5848dbbabfe7107c013e485e8c0c34443387c974e60463e
-SIZE (cschuber-exmh-2022.09.28-be4b011_GH0.tar.gz) = 1002297
+TIMESTAMP = 1727821318
+SHA256 (cschuber-exmh-2022.09.28-8b183a_GH0.tar.gz) = 8540fed8a43e85d3d4a8aa08c8c9cf337e0f3d89cd90ac8e2edfb2efaaa8036f
+SIZE (cschuber-exmh-2022.09.28-8b183a_GH0.tar.gz) = 1004619
diff --git a/mail/exmh-devel/pkg-plist b/mail/exmh-devel/pkg-plist
index 8827b8d81cf9..cda47f4df2f6 100644
--- a/mail/exmh-devel/pkg-plist
+++ b/mail/exmh-devel/pkg-plist
@@ -1,230 +1,231 @@
@mode 555
@owner bin
@group bin
bin/exmh
bin/exmh-async
bin/exmh-bg
bin/exmh-strip
bin/ftp.expect
bin/inc.expect
@owner bin
@group bin
@dir lib/exmh-%%EXMH_VERSION%%
@mode 444
lib/exmh-%%EXMH_VERSION%%/PgpDecryptExpect
lib/exmh-%%EXMH_VERSION%%/addr.tcl
lib/exmh-%%EXMH_VERSION%%/aliases.tcl
lib/exmh-%%EXMH_VERSION%%/app-defaults
lib/exmh-%%EXMH_VERSION%%/app-defaults-color
lib/exmh-%%EXMH_VERSION%%/app-defaults-mono
lib/exmh-%%EXMH_VERSION%%/audit.tcl
lib/exmh-%%EXMH_VERSION%%/autorefile.tcl
lib/exmh-%%EXMH_VERSION%%/background.tcl
lib/exmh-%%EXMH_VERSION%%/base64.tcl
lib/exmh-%%EXMH_VERSION%%/bindings.tcl
lib/exmh-%%EXMH_VERSION%%/bitmaps/abort.xbm
lib/exmh-%%EXMH_VERSION%%/bitmaps/address.xbm
lib/exmh-%%EXMH_VERSION%%/bitmaps/bind.xbm
lib/exmh-%%EXMH_VERSION%%/bitmaps/bitmaps.defaults
lib/exmh-%%EXMH_VERSION%%/bitmaps/commit.xbm
lib/exmh-%%EXMH_VERSION%%/bitmaps/compose.xbm
lib/exmh-%%EXMH_VERSION%%/bitmaps/delete.xbm
lib/exmh-%%EXMH_VERSION%%/bitmaps/forward.xbm
lib/exmh-%%EXMH_VERSION%%/bitmaps/getmail.xbm
lib/exmh-%%EXMH_VERSION%%/bitmaps/help.xbm
lib/exmh-%%EXMH_VERSION%%/bitmaps/link.xbm
lib/exmh-%%EXMH_VERSION%%/bitmaps/move.xbm
lib/exmh-%%EXMH_VERSION%%/bitmaps/new.xbm
lib/exmh-%%EXMH_VERSION%%/bitmaps/phone.xbm
lib/exmh-%%EXMH_VERSION%%/bitmaps/pref.xbm
lib/exmh-%%EXMH_VERSION%%/bitmaps/quote.xbm
lib/exmh-%%EXMH_VERSION%%/bitmaps/scan.xbm
lib/exmh-%%EXMH_VERSION%%/bitmaps/search.xbm
lib/exmh-%%EXMH_VERSION%%/bitmaps/send.xbm
lib/exmh-%%EXMH_VERSION%%/bitmaps/sign.xbm
lib/exmh-%%EXMH_VERSION%%/bitmaps/unmark.xbm
lib/exmh-%%EXMH_VERSION%%/bitmaps/write.xbm
lib/exmh-%%EXMH_VERSION%%/bogo.tcl
lib/exmh-%%EXMH_VERSION%%/busy.tcl
lib/exmh-%%EXMH_VERSION%%/buttons.tcl
lib/exmh-%%EXMH_VERSION%%/calendar.tcl
lib/exmh-%%EXMH_VERSION%%/clink.au
lib/exmh-%%EXMH_VERSION%%/crypt.tcl
lib/exmh-%%EXMH_VERSION%%/cutbuffer.tcl
lib/exmh-%%EXMH_VERSION%%/dragNdrop.tcl
lib/exmh-%%EXMH_VERSION%%/drip.au
lib/exmh-%%EXMH_VERSION%%/editor.tcl
lib/exmh-%%EXMH_VERSION%%/env.tcl
lib/exmh-%%EXMH_VERSION%%/error.tcl
lib/exmh-%%EXMH_VERSION%%/exec.tcl
lib/exmh-%%EXMH_VERSION%%/exmh.bitmap
lib/exmh-%%EXMH_VERSION%%/extrasInit.tcl
lib/exmh-%%EXMH_VERSION%%/exwin.tcl
lib/exmh-%%EXMH_VERSION%%/faces.tcl
lib/exmh-%%EXMH_VERSION%%/fcache.tcl
lib/exmh-%%EXMH_VERSION%%/fdisp.tcl
lib/exmh-%%EXMH_VERSION%%/fdispColor.tcl
lib/exmh-%%EXMH_VERSION%%/fdispPopup.tcl
lib/exmh-%%EXMH_VERSION%%/fileselect.tcl
lib/exmh-%%EXMH_VERSION%%/find.tcl
lib/exmh-%%EXMH_VERSION%%/flag.tcl
lib/exmh-%%EXMH_VERSION%%/flagdown.bitmap
lib/exmh-%%EXMH_VERSION%%/flagdown.gif
lib/exmh-%%EXMH_VERSION%%/flagdown.mask
lib/exmh-%%EXMH_VERSION%%/flagspool.bitmap
lib/exmh-%%EXMH_VERSION%%/flagspool.gif
lib/exmh-%%EXMH_VERSION%%/flagspool.mask
lib/exmh-%%EXMH_VERSION%%/flagup.bitmap
lib/exmh-%%EXMH_VERSION%%/flagup.gif
lib/exmh-%%EXMH_VERSION%%/flagup.mask
lib/exmh-%%EXMH_VERSION%%/flist.tcl
lib/exmh-%%EXMH_VERSION%%/folder.tcl
lib/exmh-%%EXMH_VERSION%%/folderNew.tcl
lib/exmh-%%EXMH_VERSION%%/fontsel.tcl
lib/exmh-%%EXMH_VERSION%%/ftoc.tcl
lib/exmh-%%EXMH_VERSION%%/ftocFind.tcl
lib/exmh-%%EXMH_VERSION%%/ftp_get.tcl
lib/exmh-%%EXMH_VERSION%%/getnews.tcl
lib/exmh-%%EXMH_VERSION%%/glimpse.tcl
lib/exmh-%%EXMH_VERSION%%/help.tcl
lib/exmh-%%EXMH_VERSION%%/hourglass.bitmap
lib/exmh-%%EXMH_VERSION%%/hourglass.mask
lib/exmh-%%EXMH_VERSION%%/hourglass1.bitmap
lib/exmh-%%EXMH_VERSION%%/hourglass2.bitmap
lib/exmh-%%EXMH_VERSION%%/hourglass2.mask
lib/exmh-%%EXMH_VERSION%%/html.tcl
lib/exmh-%%EXMH_VERSION%%/html/AddrEdit.html
lib/exmh-%%EXMH_VERSION%%/html/AddressBk.html
lib/exmh-%%EXMH_VERSION%%/html/AliasAddr.html
lib/exmh-%%EXMH_VERSION%%/html/Aliases.html
lib/exmh-%%EXMH_VERSION%%/html/Bindings.html
lib/exmh-%%EXMH_VERSION%%/html/DSN-MDN.html
lib/exmh-%%EXMH_VERSION%%/html/Font.html
lib/exmh-%%EXMH_VERSION%%/html/Import.html
lib/exmh-%%EXMH_VERSION%%/html/Intro.html
lib/exmh-%%EXMH_VERSION%%/html/Keys.html
lib/exmh-%%EXMH_VERSION%%/html/Lists.html
lib/exmh-%%EXMH_VERSION%%/html/PGP.html
lib/exmh-%%EXMH_VERSION%%/html/Preferences.html
lib/exmh-%%EXMH_VERSION%%/html/Reply.html
lib/exmh-%%EXMH_VERSION%%/html/Search.html
lib/exmh-%%EXMH_VERSION%%/html/Sedit.html
lib/exmh-%%EXMH_VERSION%%/html/Seditpref.html
lib/exmh-%%EXMH_VERSION%%/html/Y2K.html
lib/exmh-%%EXMH_VERSION%%/html/blu-ball.gif
lib/exmh-%%EXMH_VERSION%%/html/bugfixes.html
lib/exmh-%%EXMH_VERSION%%/html/copyright.html
lib/exmh-%%EXMH_VERSION%%/html/custom.html
lib/exmh-%%EXMH_VERSION%%/html/exmh-fans.html
lib/exmh-%%EXMH_VERSION%%/html/exmh-faq.html
lib/exmh-%%EXMH_VERSION%%/html/exmh.README.html
lib/exmh-%%EXMH_VERSION%%/html/exmh.pref.gif
lib/exmh-%%EXMH_VERSION%%/html/exmh.snap1.gif
lib/exmh-%%EXMH_VERSION%%/html/guide.html
lib/exmh-%%EXMH_VERSION%%/html/index.html
lib/exmh-%%EXMH_VERSION%%/html/left-arrow.gif
lib/exmh-%%EXMH_VERSION%%/html/maillist.html
lib/exmh-%%EXMH_VERSION%%/html/mime.attack.html
lib/exmh-%%EXMH_VERSION%%/html/newfeatures.html
lib/exmh-%%EXMH_VERSION%%/html/overview.html
lib/exmh-%%EXMH_VERSION%%/html/ppp.howto.html
lib/exmh-%%EXMH_VERSION%%/html/red-ball.gif
lib/exmh-%%EXMH_VERSION%%/html/reference.html
lib/exmh-%%EXMH_VERSION%%/html/right-arrow.gif
lib/exmh-%%EXMH_VERSION%%/html/software.html
lib/exmh-%%EXMH_VERSION%%/html/symlink.html
lib/exmh-%%EXMH_VERSION%%/html/tutorial.html
lib/exmh-%%EXMH_VERSION%%/html/whatis.html
lib/exmh-%%EXMH_VERSION%%/html/yel-ball.gif
lib/exmh-%%EXMH_VERSION%%/html_cache.tcl
lib/exmh-%%EXMH_VERSION%%/html_content.tcl
lib/exmh-%%EXMH_VERSION%%/html_dpackage.tcl
lib/exmh-%%EXMH_VERSION%%/html_formtag.tcl
lib/exmh-%%EXMH_VERSION%%/html_frame.tcl
lib/exmh-%%EXMH_VERSION%%/html_get_http.tcl
lib/exmh-%%EXMH_VERSION%%/html_head.tcl
lib/exmh-%%EXMH_VERSION%%/html_hr.tcl
lib/exmh-%%EXMH_VERSION%%/html_images.tcl
lib/exmh-%%EXMH_VERSION%%/html_links.tcl
lib/exmh-%%EXMH_VERSION%%/html_maps.tcl
lib/exmh-%%EXMH_VERSION%%/html_stubs.tcl
lib/exmh-%%EXMH_VERSION%%/html_tags.tcl
lib/exmh-%%EXMH_VERSION%%/html_text.tcl
lib/exmh-%%EXMH_VERSION%%/http_proxy.tcl
lib/exmh-%%EXMH_VERSION%%/import.tcl
lib/exmh-%%EXMH_VERSION%%/inc.tcl
lib/exmh-%%EXMH_VERSION%%/ispell.tcl
lib/exmh-%%EXMH_VERSION%%/labels.tcl
lib/exmh-%%EXMH_VERSION%%/linethru.bitmap
lib/exmh-%%EXMH_VERSION%%/loaderror.ppm
lib/exmh-%%EXMH_VERSION%%/loading.ppm
lib/exmh-%%EXMH_VERSION%%/mailcap.tcl
lib/exmh-%%EXMH_VERSION%%/main.tcl
lib/exmh-%%EXMH_VERSION%%/mbempty.bitmap
lib/exmh-%%EXMH_VERSION%%/mbtidy.bitmap
lib/exmh-%%EXMH_VERSION%%/mbuntidy.bitmap
lib/exmh-%%EXMH_VERSION%%/mh.tcl
lib/exmh-%%EXMH_VERSION%%/mime.tcl
lib/exmh-%%EXMH_VERSION%%/mime.types
lib/exmh-%%EXMH_VERSION%%/mimencode.tcl
lib/exmh-%%EXMH_VERSION%%/mimeSun.tcl
lib/exmh-%%EXMH_VERSION%%/mosaic.tcl
lib/exmh-%%EXMH_VERSION%%/msg.tcl
lib/exmh-%%EXMH_VERSION%%/msgShow.tcl
lib/exmh-%%EXMH_VERSION%%/pgpBase.tcl
lib/exmh-%%EXMH_VERSION%%/pgpEWN.tcl
lib/exmh-%%EXMH_VERSION%%/pgpExec.tcl
lib/exmh-%%EXMH_VERSION%%/pgpGpg.tcl
lib/exmh-%%EXMH_VERSION%%/pgpMain.tcl
lib/exmh-%%EXMH_VERSION%%/pgpMatch.tcl
lib/exmh-%%EXMH_VERSION%%/pgpMisc.tcl
lib/exmh-%%EXMH_VERSION%%/pgpOld.tcl
lib/exmh-%%EXMH_VERSION%%/pgpPgp2.tcl
lib/exmh-%%EXMH_VERSION%%/pgpPgp5.tcl
lib/exmh-%%EXMH_VERSION%%/pgpPgp65.tcl
lib/exmh-%%EXMH_VERSION%%/pgpShared.tcl
lib/exmh-%%EXMH_VERSION%%/pgpWWW.tcl
lib/exmh-%%EXMH_VERSION%%/pick.tcl
lib/exmh-%%EXMH_VERSION%%/pop.tcl
lib/exmh-%%EXMH_VERSION%%/post.tcl
lib/exmh-%%EXMH_VERSION%%/preferences.tcl
lib/exmh-%%EXMH_VERSION%%/print.tcl
lib/exmh-%%EXMH_VERSION%%/ps.tcl
lib/exmh-%%EXMH_VERSION%%/quote.tcl
lib/exmh-%%EXMH_VERSION%%/receipt.tcl
+lib/exmh-%%EXMH_VERSION%%/recoll.tcl
lib/exmh-%%EXMH_VERSION%%/report.tcl
lib/exmh-%%EXMH_VERSION%%/rich2tk.tcl
lib/exmh-%%EXMH_VERSION%%/scan.tcl
lib/exmh-%%EXMH_VERSION%%/sedit.tcl
lib/exmh-%%EXMH_VERSION%%/seditBind.tcl
lib/exmh-%%EXMH_VERSION%%/seditCompose.tcl
lib/exmh-%%EXMH_VERSION%%/seditEnriched.tcl
lib/exmh-%%EXMH_VERSION%%/seditExtras.tcl
lib/exmh-%%EXMH_VERSION%%/seditMime.tcl
lib/exmh-%%EXMH_VERSION%%/seditQP.tcl
lib/exmh-%%EXMH_VERSION%%/seditSel.tcl
lib/exmh-%%EXMH_VERSION%%/select.tcl
lib/exmh-%%EXMH_VERSION%%/send.tcl
lib/exmh-%%EXMH_VERSION%%/sequences.tcl
lib/exmh-%%EXMH_VERSION%%/seqwin.tcl
lib/exmh-%%EXMH_VERSION%%/sound.tcl
lib/exmh-%%EXMH_VERSION%%/source.tcl
lib/exmh-%%EXMH_VERSION%%/stacktrace.tcl
lib/exmh-%%EXMH_VERSION%%/tclIndex
lib/exmh-%%EXMH_VERSION%%/text.tcl
lib/exmh-%%EXMH_VERSION%%/textButton.tcl
lib/exmh-%%EXMH_VERSION%%/textSelect.tcl
lib/exmh-%%EXMH_VERSION%%/thread.tcl
lib/exmh-%%EXMH_VERSION%%/timer.bitmap
lib/exmh-%%EXMH_VERSION%%/tioga.tcl
lib/exmh-%%EXMH_VERSION%%/uri.tcl
lib/exmh-%%EXMH_VERSION%%/url.bitmap
lib/exmh-%%EXMH_VERSION%%/urlFace.tcl
lib/exmh-%%EXMH_VERSION%%/user.tcl
lib/exmh-%%EXMH_VERSION%%/utils.tcl
lib/exmh-%%EXMH_VERSION%%/widgetMenu.tcl
lib/exmh-%%EXMH_VERSION%%/widgetText.tcl
lib/exmh-%%EXMH_VERSION%%/widgets.tcl
lib/exmh-%%EXMH_VERSION%%/xns.tcl
lib/exmh-%%EXMH_VERSION%%/xnsgetmail.exp
share/man/man1/exmh.1.gz