CVS commit: pkgsrc/mail/exmh

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/mail/exmh
From: "Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>
Date: Sun, 25 May 2025 15:04:08 +0000

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun May 25 15:04:07 UTC 2025

Modified Files:
        pkgsrc/mail/exmh: DESCR Makefile PLIST distinfo
        pkgsrc/mail/exmh/files: build config
Added Files:
        pkgsrc/mail/exmh/files: README.pkgsrc
        pkgsrc/mail/exmh/patches: patch-lib_fontsel.tcl
            patch-lib_html__tags.tcl patch-lib_html__text.tcl
Removed Files:
        pkgsrc/mail/exmh/patches: patch-lib_mime.tcl patch-ta patch-tb patch-tc
            patch-td patch-te patch-tf

Log Message:
mail/exmh: update to 2.9.0

# pkgsrc changes
* changed MASTER_SITES to SourceForge
* added LICENSE
* Makefile revision
* allow to detect gpg2
* install missing scripts
* removed old patches, merged upstream
* fixed a couple of bugs

# upstream changes (full changelog since 2.7.2, no summary provided)

7/11/2018 valdis.kletnieks%vt.edu@localhost
  Tag and push a 2.9.0 release to clear up the confusion
  from 6 years of moving code calling itself 2.8.0

cvs repository 04/25/2017 valdis.kletnieks%vt.edu@localhost
  Finally heave 'mhn' over the side.
  lib/app-defaults lib/editor.tcl lib/extrasInit.tcl lib/mh.tcl lib/msg.tcl
  lib/partial.tcl lib/sedit.tcl lib/seditExtras.tcl lib/seditMime.tcl
  lib/partial/{Sedit,custom,guide,mime.attack,reference,software}.html

cvs repository 04/24/2017 valdis.kletnieks%vt.edu@localhost
  Add lib/stacktrace.tcl for debugging use

cvs repository 04/21/2017 valdis.kletnieks%vt.edu@localhost
  Fix insufficent quoting of parameters to MDNGenerate - blows up if
  syntactically invalid address is passed in the DSN: header.
  lib/recipt.tcl

cvs repository 04/21/2017 valdis.kletnieks%vt.edu@localhost
  Use version.bash rather than version.csh - who still uses csh for
  shell scripting?
  Makefile, version.bash

cvs repository 04/21/2017 valdis.kletnieks%vt.edu@localhost
  Proclaim myself emperor
  exmh.install

cvs repository 04/21/2017 valdis.kletnieks%vt.edu@localhost
  Fix gnupg Comment field to dynamically update to the currently running version
  lib/pgpGpg.tcl

cvs repository 04/21/2017 valdis.kletnieks%vt.edu@localhost
  Add skeleton support for nmh 'mhical'  and third-party 'gcalcli' to deal
  with text/calendar mail.
  lib/mh.tcl, lib/mime.types, lib/calendar.tcl, lib/extrasInit.tcl

cvs repository 04/21/2017 valdis.kletnieks%vt.edu@localhost
  Tk/Tcl 8.5 is now a decade old.  Heave all pre-8.5 support code
  over the side.
  exmh.MASTER, exmh.install, exmh, install.tcl, lib/addr.tcl,
  lib/main.tcl, lib/mime.tcl, lib/sedit.tcl, lib/utils.tcl

cvs repository 16/6/2012 az%debian.org@localhost
  applied patch by Wolfgang Denk to add 'from+to+cc' option
  to the pick dialog.

cvs repository 21/5/2012 az%debian.org@localhost
  fixed receipt.tcl so that content-disposition-notifications
  work with nmh 1.5.

cvs repository 8/5/2012 az%debian.org@localhost
  applied patches by tom lane and kevin cosgrove:
  improved handling of xhost issues, more robust pgp message parsing

cvs repository 04/24/2012 valdis.kletnieks%vt.edu@localhost
  Fix the 'lassign' issue more correctly - Brent Welch suggested
  how to define one on the fly for pre-tcl8.5.  So we bite the bullet
  and actually use the 8.5 calling sequence.
  main.tcl, html.tcl, html_formtag.tcl, html_get_http.tcl,
  html_links.tcl, msgShow.tcl

cvs repository 04/22/2012 az%debian.org@localhost
  added two patches from debian:
  . make audit logging a configurable option
  . ensure that $HOSTNAME is set in exmhwrapper

cvs repository 04/21/2012 welch%panasas.com@localhost
  Update version to 2.8.0
  This changes
  Makefile
  exmh.install
  lib/html/exmh.README.html
  lib/html/index.html
  lib/html/software.html

cvs repository 04/21/2012 welch%panasas.com@localhost
  Added darwin to ps.tcl "SYS V like systems case
  Added jpilot scripts to misc, contributed by gerhard.siegesmund%epost.de@localhost
  Added Tar.exclude files used for generating tarball releases
  Fixed MH references in index.html and software.html

  Added misc/sequence.patch that reflects my local changes to how
  sequence information is updated in the UI.  This is a non-trivial
  change, and while it is faster, I think there are some lingering
  corner cases where it isn't perfect.  So, I'm just saving the patch
  and not committing the change to the code.

cvs repository 01/23/2012 az%debian.org@localhost
  repaired gnupg cipher option handling

cvs repository az az 01/20/2012 az%debian.org@localhost
  repaired date/time parsing in addr.tcl, which kept
  address db expiration from working properly

cvs repository 12/06/2011 valdis.kletnieks%vt.edu@localhost
  lib/pgpMail.tcl - add code to trim trailing blanks before
  doing PGP signing/encrypting.

cvs repository 04/24/2011 az%debian.org@localhost
  consolidated spell checking options: main on sedit pref page,
  i-spell specific stuff on its own page. i-spell now an explicit
  choice among spelling programs. updated all related preference
  doc strings.
  updated app defaults to include i-spell whole buffer in the more...
  menu. updated i-spell sedit hook to enable/disable ispell or i-spell
  depending on spell checker choice.
  fixed exmh-async integration of custom spell checker: now in line with
  ispell.

cvs repository az 04/21/2011 az%debian.org@localhost
  mime.tcl: fixed  documentation of behaviour of mimeFullHeaders
  exmh.MASTER: fixed tk8.5 font issue. default choice 'fixed' misinterpreted
  by tk8.5 as a font face, not XLFD...now fixed defined as alias for
  TkFixedFont, and aliases are consulted first. still somebody will have to
  extend the font chooser dialog to cover font faces.

cvs repository 09/02/2010 az%debian.org@localhost
  lib/msgShow.tcl: applied Harvey Eneman's patch that fixes handling
  of rfc2369 list-* headers.

cvs repository 08/29/2010 az%debian.org@localhost
  implemented quoting of unknown directives when editing
  text/enriched mails with sedit
  (this is a fix for debian bug #175193, http://bugs.debian.org/175193)

cvs repository 08/26/2010 valdis.kletnieks%vt.edu@localhost
  Finally found the cause of the exmh Log window breaking - we
  carry our own lassign that had the parameters in opposite order
  to what base 8.5 code expects, specifically breaking 'clock format'
  and who knows what else. So rename our lassign to exmh_lassign.
  lib/html.tcl, lib/html_formtag.tcl, lib/html_get_http.tcl,
  lib/html_links.tcl lib/msgShow.tcl, lib/utils.tcl

cvs repository 08/26/2010 valdis.kletnieks%vt.edu@localhost
  By default, convert blanks to _ in the 'save as' dialog
  lib/fileselect.tcl

cvs repository 08/26/2010 valdis.kletnieks%vt.edu@localhost
  Heave some tcl 7.0-specific code over the side, 7.1 came
  out in 1993.  Is our core code *really* that old? :)
  exmh-strip.MASTER exmh-bg.MASTER exmh.MASTER

cvs repository 06/20/2008 az%debian.org@localhost
  incorporated a number of patches from debian
  exmh.l: silence some man warnings
  lib/mh.tcl: mention install-mh by full path in initial greeting
  lib/bogo.tcl: add learning-from-stdin for learning ham, too
   (not just spam)
  lib/glimpse.tcl: add the -W glimpse option (and scope for
   whole file) to permanent preferences
  lib/scan.tcl, lib/folder.tcl: fix the stale scan cache problem
  lib/uri.tcl, html_links.tcl: make html links clickable in
   inline-displayed html, and consolidate status line handling for links
  lib/seditExtras.tcl, lib/mime.tcl: patch from Marion Hakanson to
   fix fd leakage in internal mime qp/base64 decoder
   patch from debian: add support for recode as alternative to mimencode
  lib/pgpExec.tcl, lib/pgpGpg.tcl, lib/extrasInit.tcl: added support
   for gnupg's gpg-agent

cvs repository 06/26/2006 valdis.kletnieks%vt.edu@localhost
  lib/html_dpackage.tcl: Skip over <style>..</style> blocks we don't
  know how to interpret anyhow. Thanks to Don Koch <aardvark%krl.com@localhost>
  for the patch, and Rick Baartman <baartman%lin12.triumf.ca@localhost> for asking.

cvs repository 05/08/2005 valdis.kletnieks%vt.edu@localhost
  exmh.l: debian bug #309891 by way of Alexander Zangerl
  Fix a bunch of typos

cvs repository 4/27/2005 jbeck%eng.sun.com@localhost
  lib/app-defaults-color
  lib/msgShow.tcl: Added support for marking text between stars
    (e.g., I *really* mean it) in a bold font.

cvs repository 4/27/2005 jbeck%eng.sun.com@localhost
  lib/app-defaults-color
  lib/msgShow.tcl: Updated regular expressions for Sun bug report
    highlighting, added support for SpamAssassin report highlighting.

cvs repository 4/27/2005 welch%panasas.com@localhost
  lib/bogo.tcl: Added BogoSetup as a trace on bogo(progname) so that
    preference changes are reflected immediately w/out restarting exmh.

cvs repository 4/21/2005 valdis.kletnieks%vt.edu@localhost
  lib/mime.tcl: Add call to FileExistsDialog to prompt before saving a
    MIME part into an already existing file.

cvs repository 4/15/2005 welch%panasas.com@localhost channeling Alexander Zangerl
  lib/bogo.tcl: add the option to give the spam filter a list of message file
    names on its command line instead of running the filter once on each
    message as standard input.  We know this works for spamassassin,
    but not sure about the other filters.

cvs repository 4/4/2005 welch%panasas.com@localhost
  lib/fileselect.tcl: made use of the built-in tk file dialogs optional.
    The setting is under the "FS Box" preferences panel.
    my fingers have grown to know and love the fileselect behavior.
  lib/fileselect.tcl
  lib/html_content.tcl
  lib/main.tcl
  lib/mime.tcl
  lib/msg.tcl
  lib/seditExtras.tcl
    Restored/updated calls to FSbox (aka fileselect)
  lib/flist.tcl: fixed FlistUncache to properly clear the global variable in the bg interp
  lib/mh.tcl: added calls to FlistUncache

cvs repository 3/18/2005 welch%panasas.com@localhost channeling Alexander Zangerl
  lib/flist.tcl: Adding FlistUncache to unset flistcache when appropriate
  lib/folder.tcl: Call FlistUncache when we commit folder changes

cvs repository 3/17/2005 welch%panasas.com@localhost channeling Alexander Zangerl
  exmhcomp: support mailto URLs

cvs repository 3/4/2005 cwg-exmh%deepeddy.com@localhost
  lib/seqwin.tcl - Make Warp & Narrow work if you aren't already in
  the folder.

cvs repository 3/1/2005 cwg-exmh%deepeddy.com@localhost
  lib/html_content.tcl, lib/main.tcl, lib/mime.tcl, lib/msg.tcl,
  lib/seditExtras.tcl - Call tk_getOpenDialog or tk_GetSaveDialog
  instead of FSBox.

cvs repository 3/1/2005 cwg-exmh%deepeddy.com@localhost
  lib/main.tcl: Add 'Source' button to log window so I can read in a
  new source file w/o erasing what's in the command line.

cvs repository 3/1/2005 cwg-exmh%deepeddy.com@localhost
  lib/flist.tcl: Run FlistUnseenFoldersInit in the foreground so that
  it actually works.

cvs repository 2/18/2005 cwg-exmh%deepeddy.com@localhost
  lib/ftoc.tcl: Fix patch of 2/3 so it doesn't break if you don't have
  a detached message window.

cvs repository 2/9/2005 valdis.kletnieks%vt.edu@localhost
  lib/mime.tcl: resolve (or at least work around) Debian bug 294212
  as a too-zealous splatting of specials broke some content types.
  I'm adding '.' to the list, but I'm not comfortable adding the full
  list of rc2045 chars as it includes some shell metachars...

cvs repository 2/3/2005 cwg-exmh%deepeddy.com@localhost
  lib/ftoc.tcl: Reset exwin(ftext) whenever the ftext window changes size.

cvs repository 1/25/2005 cwg-exmh%deepeddy.com@localhost
  lib/mime.tcl: Special case display of original message in
  spamassassin processed mail so it doesn't display by default.

cvs repository 1/24/2005 welch%panasas.com@localhost
  lib/folder.tcl: fixed the background folder purging script
    to properly pick up things from the script library

cvs repository 1/19/2005 cwg-exmh%deepeddy.com@localhost
  lib/ftoc.tcl: Really fixed bindings for exwin(ftext).

cvs repository 1/18/2005 cwg-exmh%deepeddy.com@localhost
  lib/exwin.tcl: Fixed bindings for exwin(ftext).

cvs repository 1/17/2005 welch%panasas.com@localhost
  lib/seditExtras.tcl: fixed exmh-async variation of ispell command.
  lib/seditSel.tcl: fixed exmh-async variation of ispell command

cvs repository 1/12/2005 welch%panasas.com@localhost
  lib/uri.tcl: changed use of "file link" back to exec ln
  lib/quote.tcl: changed use of "file link" back to exec ln
  exmh-strip.MASTER: eliminated use of [glob ~/.exmh/tk] in
    the setting of exmh(userLibrary), which we shouldn't need
  lib/mime.tcl: fix the exec of exmh-strip to be ${argv0}-strip
    to handle installations with a different base name.
  Makefile: fixed the ftpdist production


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/exmh/DESCR
cvs rdiff -u -r1.60 -r1.61 pkgsrc/mail/exmh/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/mail/exmh/PLIST
cvs rdiff -u -r1.11 -r1.12 pkgsrc/mail/exmh/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/exmh/files/README.pkgsrc
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/exmh/files/build
cvs rdiff -u -r1.6 -r1.7 pkgsrc/mail/exmh/files/config
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/exmh/patches/patch-lib_fontsel.tcl \
    pkgsrc/mail/exmh/patches/patch-lib_html__tags.tcl \
    pkgsrc/mail/exmh/patches/patch-lib_html__text.tcl
cvs rdiff -u -r1.1 -r0 pkgsrc/mail/exmh/patches/patch-lib_mime.tcl \
    pkgsrc/mail/exmh/patches/patch-ta pkgsrc/mail/exmh/patches/patch-tb \
    pkgsrc/mail/exmh/patches/patch-tc pkgsrc/mail/exmh/patches/patch-td \
    pkgsrc/mail/exmh/patches/patch-te pkgsrc/mail/exmh/patches/patch-tf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/exmh/DESCR
diff -u pkgsrc/mail/exmh/DESCR:1.1 pkgsrc/mail/exmh/DESCR:1.2
--- pkgsrc/mail/exmh/DESCR:1.1  Thu Nov  1 01:00:00 2001
+++ pkgsrc/mail/exmh/DESCR      Sun May 25 15:04:07 2025
@@ -1,23 +1,6 @@
-exmh is a TCL/TK based interface to the MH mail system.
-
-IMPORTANT: exmh depends on the TK send facility for its background
-processing.  With TK 3.3, send now uses xauthority mechanisms by default,
-unless you compile TK with -DTK_NO_SECURITY.  Generally, this means that
-you **MUST** must run xdm to start your Xserver.
-
-FEATURES: As well as providing the usual layer on top of MH commands, exmh
-has a number of other features:
-
-    MIME support!  Displays richtext and enriched directly.
-    Color feedback in the scan listing.
-    A colour coded folder display with one label per folder.
-    Smart scan caching.  News read/post.  koi8-r support.
-    Facesaver bitmap display.  Ispell support.
-    Background inc.  You can set exmh to run inc periodically.
-    Searching over folder listing and message body.
-    A dialog-box interface to MH pick.
-    A editor editor with emacs-like bindings with MIME support.
-    Glimpse interface.  You can index all your mail with glimpse
-       and search for messages by content.
-    User preferences.  You can tune exmh through a dialog box.
-    User hacking support.  A user library of TCL routines is supported.
+Exmh is a TCL/TK based interface to the MH (a.k.a. nmh) mail system.
+Exmh provides a graphical frontend to most MH features, including
+reading, deleting, and refiling messages. In addition, the interface
+handles arbitrary nesting of your folder hierarchy. Its extensibility
+allows Exmh to interoperate with PGP, Glimpse, ispell, faces/picons,
+MIME, and much more.

Index: pkgsrc/mail/exmh/Makefile
diff -u pkgsrc/mail/exmh/Makefile:1.60 pkgsrc/mail/exmh/Makefile:1.61
--- pkgsrc/mail/exmh/Makefile:1.60      Sun Nov 12 13:22:34 2023
+++ pkgsrc/mail/exmh/Makefile   Sun May 25 15:04:07 2025
@@ -1,60 +1,59 @@
-# $NetBSD: Makefile,v 1.60 2023/11/12 13:22:34 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2025/05/25 15:04:07 vins Exp $
 
-DISTNAME=      exmh-2.7.2
-PKGREVISION=   10
+DISTNAME=      exmh-2.9.0
 CATEGORIES=    mail tk
-MASTER_SITES=  ftp://ftp.tcl.tk/pub/tcl/exmh/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=exmh/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.beedub.com/exmh/
 COMMENT=       X11/TK based mail reader front end to MH
+LICENSE=       2-clause-bsd
 
-DEPENDS+=      nmh>=1.0:../../mail/nmh
+DEPENDS+=      nmh>=1.3:../../mail/nmh
 DEPENDS+=      metamail>=2.7:../../mail/metamail
+DEPENDS+=      mime-types-[0-9]*:../../misc/mime-types
+DEPENDS+=      tcl-expect-[0-9]*:../../lang/tcl-expect
 
-USE_TOOLS+=    tclsh
-USE_TOOLS+=    wish:run
+USE_TOOLS+=    pax tclsh wish:run
 
 .include "../../mk/bsd.prefs.mk"
 
 DIST_SUBDIR=   ${PKGNAME_NOREV}
 
-INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 lib/${PKGNAME_NOREV}/html
+EXMH_LIBDIR=   ${PREFIX}/lib/${PKGNAME_NOREV}
+EXMH_SCRIPTS=  exmh exmh-async exmh-bg exmh-strip exmhcomp \
+               ftp.expect inc.expect
+
+SUBST_CLASSES+=                paths
+SUBST_STAGE.paths=     pre-configure
+SUBST_MESSAGE.paths=   Replacing hard-coded paths.
+SUBST_FILES.paths=     exmhcomp lib/bitmaps/bitmaps.defaults
+SUBST_SED.paths+=      -e "s:/usr/local:${PREFIX}:g"
+SUBST_SED.paths+=      -e "s:/usr/bin/wish:${TOOLS_PATH.wish}:g"
+SUBST_SED.paths+=      -e "s:/usr/lib/exmh:${EXMH_LIBDIR}/bitmaps:g"
 
-# Additionally, exmh will use the following packages if present:
-# lang/expect
-# textproc/glimpse
-# security/gnupg
-# security/pgp
-# mail/faces
-# audio/rplay
+MAKE_ENV+=     PREFIX=${PREFIX} TCLSH=${TCLSH:Q} WISH=${WISH:Q} \
+               WRKSRC=${WRKSRC} FILESDIR=${FILESDIR}
+
+INSTALLATION_DIRS+=    bin ${PKGMANDIR}/man1 share/doc/${PKGBASE}
 
 do-build:
-       cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} TCLSH=${TCLSH:Q} \
-               WISH=${WISH:Q} WRKSRC=${WRKSRC} \
-               FILESDIR=${FILESDIR} ${SH} ${FILESDIR}/build
+       ${RUN}cd ${WRKSRC} && \
+       ${SETENV} ${MAKE_ENV} ${SH} ${FILESDIR}/build
+
+pre-install:
+       ${RUN}${FIND} ${WRKSRC}/lib -type f \
+               \( -name "*.orig" -o -name "*.old" \) -delete
 
 do-install:
        ${INSTALL_MAN} ${WRKSRC}/exmh.l \
                ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/exmh.1
-       for binfile in exmh-async exmh-bg exmh-strip exmh ftp.expect; do \
-               ${INSTALL_SCRIPT} ${WRKSRC}/$$binfile ${DESTDIR}${PREFIX}/bin; \
-       done
-       for libfile in \
-                       ${WRKSRC}/lib/PgpDecryptExpect \
-                       ${WRKSRC}/lib/*.tcl ${WRKSRC}/lib/*.bitmap \
-                       ${WRKSRC}/lib/*.ppm ${WRKSRC}/lib/help.* \
-                       ${WRKSRC}/lib/tclIndex ${WRKSRC}/lib/app-defaults \
-                       ${WRKSRC}/lib/app-defaults-* ${WRKSRC}/lib/*.mask \
-                       ${WRKSRC}/lib/*.exp ${WRKSRC}/lib/mime.types \
-                       ${WRKSRC}/lib/*.au ${WRKSRC}/lib/*.gif; do \
-               ${INSTALL_DATA} $$libfile \
-                       ${DESTDIR}${PREFIX}/lib/${PKGNAME_NOREV}; \
-       done
-       for hfile in ${WRKSRC}/lib/html/*; do \
-               ${INSTALL_DATA} $$hfile \
-                       ${DESTDIR}${PREFIX}/lib/${PKGNAME_NOREV}/html; \
+       for i in ${EXMH_SCRIPTS}; do \
+               ${INSTALL_SCRIPT} ${WRKSRC}/$$i ${DESTDIR}${PREFIX}/bin; \
        done
+       ${RUN}cd ${WRKSRC}/lib && ${PAX} -rw -pm . ${DESTDIR}${EXMH_LIBDIR}
+       ${INSTALL_DATA} ${FILESDIR}/README.pkgsrc \
+               ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
 .include "../../x11/tk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/exmh/PLIST
diff -u pkgsrc/mail/exmh/PLIST:1.4 pkgsrc/mail/exmh/PLIST:1.5
--- pkgsrc/mail/exmh/PLIST:1.4  Sun Jun 14 18:04:33 2009
+++ pkgsrc/mail/exmh/PLIST      Sun May 25 15:04:07 2025
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:04:33 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2025/05/25 15:04:07 vins Exp $
 bin/exmh
 bin/exmh-async
 bin/exmh-bg
 bin/exmh-strip
+bin/exmhcomp
 bin/ftp.expect
+bin/inc.expect
 lib/${PKGNAME}/PgpDecryptExpect
 lib/${PKGNAME}/addr.tcl
 lib/${PKGNAME}/aliases.tcl
@@ -15,9 +17,32 @@ lib/${PKGNAME}/autorefile.tcl
 lib/${PKGNAME}/background.tcl
 lib/${PKGNAME}/base64.tcl
 lib/${PKGNAME}/bindings.tcl
+lib/${PKGNAME}/bitmaps/abort.xbm
+lib/${PKGNAME}/bitmaps/address.xbm
+lib/${PKGNAME}/bitmaps/bind.xbm
+lib/${PKGNAME}/bitmaps/bitmaps.defaults
+lib/${PKGNAME}/bitmaps/commit.xbm
+lib/${PKGNAME}/bitmaps/compose.xbm
+lib/${PKGNAME}/bitmaps/delete.xbm
+lib/${PKGNAME}/bitmaps/forward.xbm
+lib/${PKGNAME}/bitmaps/getmail.xbm
+lib/${PKGNAME}/bitmaps/help.xbm
+lib/${PKGNAME}/bitmaps/link.xbm
+lib/${PKGNAME}/bitmaps/move.xbm
+lib/${PKGNAME}/bitmaps/new.xbm
+lib/${PKGNAME}/bitmaps/phone.xbm
+lib/${PKGNAME}/bitmaps/pref.xbm
+lib/${PKGNAME}/bitmaps/quote.xbm
+lib/${PKGNAME}/bitmaps/scan.xbm
+lib/${PKGNAME}/bitmaps/search.xbm
+lib/${PKGNAME}/bitmaps/send.xbm
+lib/${PKGNAME}/bitmaps/sign.xbm
+lib/${PKGNAME}/bitmaps/unmark.xbm
+lib/${PKGNAME}/bitmaps/write.xbm
 lib/${PKGNAME}/bogo.tcl
 lib/${PKGNAME}/busy.tcl
 lib/${PKGNAME}/buttons.tcl
+lib/${PKGNAME}/calendar.tcl
 lib/${PKGNAME}/clink.au
 lib/${PKGNAME}/crypt.tcl
 lib/${PKGNAME}/cutbuffer.tcl
@@ -181,6 +206,7 @@ lib/${PKGNAME}/sequences.tcl
 lib/${PKGNAME}/seqwin.tcl
 lib/${PKGNAME}/sound.tcl
 lib/${PKGNAME}/source.tcl
+lib/${PKGNAME}/stacktrace.tcl
 lib/${PKGNAME}/tclIndex
 lib/${PKGNAME}/text.tcl
 lib/${PKGNAME}/textButton.tcl
@@ -199,3 +225,4 @@ lib/${PKGNAME}/widgets.tcl
 lib/${PKGNAME}/xns.tcl
 lib/${PKGNAME}/xnsgetmail.exp
 man/man1/exmh.1
+share/doc/exmh/README.pkgsrc

Index: pkgsrc/mail/exmh/distinfo
diff -u pkgsrc/mail/exmh/distinfo:1.11 pkgsrc/mail/exmh/distinfo:1.12
--- pkgsrc/mail/exmh/distinfo:1.11      Tue Oct 26 10:54:00 2021
+++ pkgsrc/mail/exmh/distinfo   Sun May 25 15:04:07 2025
@@ -1,13 +1,9 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 10:54:00 nia Exp $
+$NetBSD: distinfo,v 1.12 2025/05/25 15:04:07 vins Exp $
 
-BLAKE2s (exmh-2.7.2/exmh-2.7.2.tar.gz) = f5b73b6917efb8357083caf16bc9ae77cab16868439cd148294f2078c95792a6
-SHA512 (exmh-2.7.2/exmh-2.7.2.tar.gz) = 7004a4b9fdfce38fb791323ed36c9b79bf28c78367a9f0589f558383e503443de0ff4df4b46de4c9765a9f3d2c16505096b938cec1f9104da4dd33e9a22f347d
-Size (exmh-2.7.2/exmh-2.7.2.tar.gz) = 1081601 bytes
+BLAKE2s (exmh-2.9.0/exmh-2.9.0.tar.gz) = 029251f1be91ff40bae462d87c6e755a9660bab855774a2cecf93e053029a52d
+SHA512 (exmh-2.9.0/exmh-2.9.0.tar.gz) = 37897d7c173a125c9a4d1787624748fb49b124d94e910124bbd33f42ec9245c0b478e59f03107700e22e190d7a31597ed3c8ad28a7af7482d9f7fa010b2d6954
+Size (exmh-2.9.0/exmh-2.9.0.tar.gz) = 1111608 bytes
 SHA1 (patch-aw) = 396ef41611de11a9ba48f15711e20f4e44f73da9
-SHA1 (patch-lib_mime.tcl) = 180bef533f94eb07d46874ee06d724c0fa2c0e32
-SHA1 (patch-ta) = 0670c357f0317a4b4f7684425bce8f30d7ef9cd2
-SHA1 (patch-tb) = b5f51dabf9df11420de9b50aaf7dc422eff1f3ad
-SHA1 (patch-tc) = 87ed70fd2957821c2fab06c0dc33da446dffdb6f
-SHA1 (patch-td) = cb777e02b854f82c49e20b19c08b4746dcfe76c2
-SHA1 (patch-te) = 18363fc7d6d52d8301a8d53aadb0b287e2879ccc
-SHA1 (patch-tf) = c1d29d5712b3ba7d5248094359ca3a8d434a8228
+SHA1 (patch-lib_fontsel.tcl) = ead525efcb81d719e7c9ad056f97d0290fdd281f
+SHA1 (patch-lib_html__tags.tcl) = 2a6e6857511ddcbab5e8455e7910e1334a2729fa
+SHA1 (patch-lib_html__text.tcl) = 648a24d03ed8a31ea81173430b4c8f915e42b759

Index: pkgsrc/mail/exmh/files/build
diff -u pkgsrc/mail/exmh/files/build:1.3 pkgsrc/mail/exmh/files/build:1.4
--- pkgsrc/mail/exmh/files/build:1.3    Wed Jan 14 12:20:57 2009
+++ pkgsrc/mail/exmh/files/build        Sun May 25 15:04:07 2025
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: build,v 1.3 2009/01/14 12:20:57 sketch Exp $
+# $NetBSD: build,v 1.4 2025/05/25 15:04:07 vins Exp $
 # FreeBSD Id: build,v 1.5 1997/08/21 08:09:56 peter Exp
 #
 
@@ -44,8 +44,8 @@ if [ -f ${PREFIX}/bin/pgp5 ]; then
   PGP5=${PREFIX}/bin                   #bindir
 fi
 
-if [ -f ${PREFIX}/bin/pgp6 ]; then
-  PGP6=${PREFIX}/bin                   #bindir
+if [ -f ${PREFIX}/bin/gpg2 ]; then
+  GPG2=${PREFIX}/bin                   #bindir
 fi
 
 if [ -f ${PREFIX}/bin/gpg ]; then
@@ -75,7 +75,7 @@ sed <${FILESDIR}/config \
        -e "s+!!DOMAIN!!+${DOMAIN}+g" \
        -e "s+!!PGP!!+${PGP}+g" \
        -e "s+!!PGP5!!+${PGP5}+g" \
-       -e "s+!!PGP6!!+${PGP6}+g" \
+       -e "s+!!GPG2!!+${GPG2}+g" \
        -e "s+!!GPG!!+${GPG}+g" \
        -e "s+!!GLIMPSE!!+${GLIMPSE}+g" \
        -e "s+!!PLAY!!+${PLAY}+g" \
@@ -83,12 +83,18 @@ sed <${FILESDIR}/config \
        -e "s+!!DATE!!+${DATE}+g" \
  | sed -e 's/$/\\/' >> ${SEDFILE}
 
-for i in exmh-async exmh-bg exmh-strip exmh ftp.expect
+for i in exmh-async exmh-bg exmh-strip exmh
 do
        echo "sed -f ${SEDFILE} < $i.MASTER > $i"
        sed -f ${SEDFILE} < $i.MASTER > $i
 done
 
+for i in *.expect
+do
+       printf '%s\n' "setting expect path in $i"
+       sed < $i.MASTER -e "s:exec expect:exec ${EXPECT}:" > $i
+done
+
 rm -f ${SEDFILE}
 
 echo "cd lib ;  echo 'auto_mkindex . *.tcl ; exit' | ${TCLSH}"

Index: pkgsrc/mail/exmh/files/config
diff -u pkgsrc/mail/exmh/files/config:1.6 pkgsrc/mail/exmh/files/config:1.7
--- pkgsrc/mail/exmh/files/config:1.6   Mon Oct 22 21:46:50 2001
+++ pkgsrc/mail/exmh/files/config       Sun May 25 15:04:07 2025
@@ -1,4 +1,4 @@
-# $NetBSD: config,v 1.6 2001/10/22 21:46:50 agc Exp $
+# $NetBSD: config,v 1.7 2025/05/25 15:04:07 vins Exp $
 
 set wish !!WISH!!
 set exmh(version) {version !!VERSION!! !!DATE!!}
@@ -8,7 +8,7 @@ set mh_path !!PREFIX!!/bin
 set exmh(slocal) !!PREFIX!!/libexec/nmh/slocal
 set mime(dir) !!PREFIX!!/bin
 set mailcap_default !!PREFIX!!/etc/mailcap
-set mimetypes_default !!PREFIX!!/lib/exmh-!!VERSION!!/mime.types
+set mimetypes_default !!PREFIX!!/etc/mime.types
 set exmh(expect) !!EXPECT!!
 set exmh(expectk) !!EXPECTK!!
 set faces(dir) !!FACES!!
@@ -19,8 +19,8 @@ set faces(defaultDomain) !!DOMAIN!!
 set faces(suffix) {xpm gif xbm}
 set pgp(pgp,path) !!PGP!!
 set pgp(pgp5,path) !!PGP5!!
-set pgp(pgp6,path) !!PGP6!!
 set pgp(gpg,path) !!GPG!!
+set pgp(gpg2,path) !!GPG2!!
 set glimpse(path) !!GLIMPSE!!
 set sound(cmd) !!PLAY!!
 set exmh(library) !!PREFIX!!/lib/exmh-!!VERSION!!

Added files:

Index: pkgsrc/mail/exmh/files/README.pkgsrc
diff -u /dev/null pkgsrc/mail/exmh/files/README.pkgsrc:1.1
--- /dev/null   Sun May 25 15:04:08 2025
+++ pkgsrc/mail/exmh/files/README.pkgsrc        Sun May 25 15:04:07 2025
@@ -0,0 +1,21 @@
++----------------------------------------------------------------------
+| EXMH extentions 
++---------------------------------------------------------------------
+
+EXMH has a number of optional features that require additional
+software to be installed. You may want to consider some or all of
+these packages:
+
+ * databases/openldap-client
+ * mail/faces
+ * mail/procmail
+ * textproc/antiword
+ * textproc/glimpse
+ * textproc/ispell
+ * audio/rplay
+
+In addition, exmh supports pgp encryption through:
+
+ * security/gnupg[1-2]
+ * security/pgp5
+-----------------------------------------------------------------------

Index: pkgsrc/mail/exmh/patches/patch-lib_fontsel.tcl
diff -u /dev/null pkgsrc/mail/exmh/patches/patch-lib_fontsel.tcl:1.1
--- /dev/null   Sun May 25 15:04:08 2025
+++ pkgsrc/mail/exmh/patches/patch-lib_fontsel.tcl      Sun May 25 15:04:07 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-lib_fontsel.tcl,v 1.1 2025/05/25 15:04:07 vins Exp $
+
+Make HTML font configurable.
+
+--- lib/fontsel.tcl.orig       2017-11-10 04:42:24.000000000 +0000
++++ lib/fontsel.tcl
+@@ -32,6 +32,7 @@ proc Font_Dialog {} {
+           *Ftoc*Text.font
+           *Msg*Text.font
+           *Sedit*Text.font
++          *HTML.font
+       } 
+       foreach resource $fontreslist {
+           $m add command -label $resource -command "FontSetResource $resource \$font(current)"
Index: pkgsrc/mail/exmh/patches/patch-lib_html__tags.tcl
diff -u /dev/null pkgsrc/mail/exmh/patches/patch-lib_html__tags.tcl:1.1
--- /dev/null   Sun May 25 15:04:08 2025
+++ pkgsrc/mail/exmh/patches/patch-lib_html__tags.tcl   Sun May 25 15:04:07 2025
@@ -0,0 +1,28 @@
+$NetBSD: patch-lib_html__tags.tcl,v 1.1 2025/05/25 15:04:07 vins Exp $
+
+Workaround for unconfigurable font family and inconsistent sizing. 
+
+--- lib/html_tags.tcl.orig     2017-11-10 04:42:24.000000000 +0000
++++ lib/html_tags.tcl
+@@ -51,19 +51,8 @@ proc HMtag_base {win param text} {
+ # are likely
+ 
+ proc HMset_font {win tag font} {
+-      global Fonts
+-      set label [StatusLabel $win]    ;# This may not exist for msg dialogs
+-      if {![info exists Fonts($font)]} {
+-              set Fonts($font) 1
+-              catch {$label configure -fg blue}
+-              Status $win "downloading font $font"
+-              set status 1
+-      }
+-      catch {$win tag configure $tag -font $font}
+-      if [info exists status] {
+-          StatusLazy $win {}
+-          catch {$label configure -fg black}
+-      }
++    set font [option get . HTML.font {}]
++    catch {$win tag configure $tag -font {$font 10}}
+ }
+ 
+ # Lets invent a new HTML tag, just for fun.
Index: pkgsrc/mail/exmh/patches/patch-lib_html__text.tcl
diff -u /dev/null pkgsrc/mail/exmh/patches/patch-lib_html__text.tcl:1.1
--- /dev/null   Sun May 25 15:04:08 2025
+++ pkgsrc/mail/exmh/patches/patch-lib_html__text.tcl   Sun May 25 15:04:07 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-lib_html__text.tcl,v 1.1 2025/05/25 15:04:07 vins Exp $
+
+Fix for nonexistent "state(tag)" variable runtime error.
+
+--- lib/html_text.tcl.orig     2017-11-10 04:42:24.000000000 +0000
++++ lib/html_text.tcl
+@@ -60,7 +60,7 @@ proc Text_TagAdd {win tag m1 {m2 {}}} {
+     }
+     set state(tag) $tag
+     $win dump -tag -text -window -command \
+-          [list TextUndoTagAddProc state $win] $m1 $m2
++          [list TextUndoTagAddProc state $win] $m1 $m2 tag
+     TextUndoTagAdd state $win [$win index $m2]
+     $win tag add $tag $m1 $m2
+ }
+@@ -179,7 +179,7 @@ proc TextUndoTagRemove {stateVar win end
+       unset state(ix)
+     }
+ }
+-proc TextUndoTagAddProc {stateVar win key value ix} {
++proc TextUndoTagAddProc {stateVar win key value ix tag} {
+     upvar $stateVar state
+     switch -- $key {
+       tagon {

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index