Tue Nov 21 10:32:02 2017 UTC ()
nmh: Update mail/nmh to 1.7

pkgsrc changes:
 - Update MASTER_SITES (use https:// and avoid redirects)

 - Delete (a bit outdated) comment about locking mechanisms

   Since 02 Feb 2014 (post-1.6) the default locking mechanisms are
   (directly from m4/locking.m4):

    - aix*|cygwin*|linux*: fcntl
    - freebsd*|*netbsd*|openbsd*|darwin*: flock
    - everything else: dot

   The original comment was probably about just NetBSD and maybe Solaris
   (it's dated 1999). Solaris still uses the `dot' mechanisms by default
   but we no longer have any local patches about locking.

 - Delete (no more needed) `-O1' hack to CFLAGS

   mh_strcasecmp() was completely replaced by strcasecmp() on 24 Mar 2013, and
   hence present in 1.6. Forcing `-O1' for gcc is no longer needed.

 - Adjust --sysconfdir CONFIGURE_ARGS per-upstream change, now the nmh
   directory is created by nmh's configure so pass PKG_SYSCONFBASE instead of
   PKG_SYSCONFDIR.

 - Add support for the `test' phase

   Add support for nmh tests. Modify patches/patch-ca accordingly in order to
   adjust TEST_ENVIRONMENT to use the configuration files in $egdir instead of the
   ones in $nmhetcdir.
   Actually all tests are passed except an mhparam test that sposts the
   $egdir/$nmetcdir kludge.

 - Do not include bsd.prefs.mk two times (NFC)

 - Add `oauth' PKG_OPTIONS (disabled by default) to enable OAuth2 support in
   SMTP and POP auth via curl

Changes:
Release notes for nmh 1.7
=========================
Welcome to nmh, the new version of the classic MH mail handling system.
It's been over three years since the last release of nmh, and there have
been a number of significant changes since the last release.  Long-time
MH and nmh uses should read careful the NOTEABLE CHANGES section, as there
are some significant changes to nmh behavior.  Otherwise, please see the
README and INSTALL files for help on getting started with nmh.

For news of future releases, subscribe to the low-volume
    https://lists.nongnu.org/mailman/listinfo/nmh-announce

---------------
NOTABLE CHANGES
---------------

The largest notable changes in the 1.7 release are:

- Complete unification of network security support.  All network protocols
  (currently, POP and SMTP) have been refactored to use a common set of
  security routines.  This means all protocols support all SASL mechanisms
  (via the Cyrus-SASL library) and TLS.  TLS support has been strengthened
  to perform certificate name validation and to require TLS 1.1 as a
  minimum protocol.  Also, all protocols can make use of the OAuth2/XOAUTH
  SASL mechanism, which is supported by Gmail.
- send(1) now supports adding switches to post(8) based on the address or
  domain of the email address in the From: header; this more easily allows
  users to support multiple identities.
- A generic facility for passing arguments to filter programs in repl(1)
  by use of the -convertargs switch.
- Native support for the manipulation of iCalendar requests; see mhical(1)
  for more details.

------------
NEW FEATURES
------------

The following are new features for the 1.7 release of nmh:

- When building from source, configure will derive ${prefix} from an existing
  nmh installation if it finds one in your $PATH.
- Added welcome message when nmh detects that its version changed.
- The default locations for configuration files and support binaries
  have been changed.  Configuration files now install into ${sysconfdir}/nmh,
  and support binaries are placed in ${libexecdir}/nmh.  If you are upgrading
  an existing installation you should look for old configuration files in
  ${sysconfdir} and merge any local customizations into the new files in
  ${sysconfdir}/nmh, then remove the old files.  ${libdir} will also contain
  obsolete support programs that should be removed.
- All TLS connections now perform certificate validation (including hostname
  matching) by default; can be disabled on a per-application basis.
- post now defaults to port 587 on 'smtp' message submission.
- A value of 0 for the width switch of scan(1), inc(1), ap(1), dp(1),
  fmttest(1), and mhl(1) now means as many characters as the format
  engine can produce [Bug #15274].  That amount is limited by internal
  buffers.
- If a component has trailing whitespace, e.g., body:component="> ",
  mhl now trims that whitespace off when filtering blank text lines.
- An "rtrim" flag has been added to mhl to remove any trailing
  whitespace from filtered text lines.  A corresponding "nortrim" flag
  has also been added.
- Added getmymbox and getmyaddr mh-format(5) function escapes.
- New -[no]changecur, -fixtype, -decodetypes, and -[no]crlflinebreaks switches
  have been added to mhfixmsg(1).
- mhfixmsg now removes an extraneous trailing semicolon from header
  parameter lists.
- Added -convertargs switch to repl(1), to pass arguments to programs
  specified in the user's profile or mhn.defaults to convert message
  content.
- Added mhical(1), to display, reply to, and cancel iCalendar (RFC 5545)
  event requests.
- Added multiply mh-format(5) function.
- "mhparam bindir" prints the path to the directory containing the public
  executables (${bindir}).
- New "-prefer" switch for mhshow (and mhlist and mhshow), to allow specifying
  the preferred content types to show, if present in a multipart alternative.
- mh-format now has %(kilo) and %(kibi) functions, to allow printing
  numbers with SI or IEC quantities, e.g. "10K", "2.3Mi".
- Support for the -sendmail flag to send/post to change the sendmail
  binary when using the sendmail/pipe MTS.
- Added support to send(1) to specify switches to post(1) based on address or
  domain name in From: header line in message draft.
- post(8) -snoop now attempts to decode base64-encoded SMTP traffic.
- folder(1) -nocreate now prints a warning message for a non-existent folder.
- mhfixmsg(1) now allows -decodetext binary, though 8bit is still the default.
- inc(1) and msgchk(1) now support TLS encryption natively.
- All network protocols support the XOAUTH authentication mechanism.
- Support for SMTPUTF8 (RFC 6531) has been added.  mhshow(1) already supported
  RFC 6532, assuming all 8-bit message header field bodies are UTF-8 and use
  of a UTF-8 locale.
- mhfixmsg now replaces RFC 2047 encoding with RFC 2231 encoding of name and
  filename parameters in Content-Type and Content-Disposition headers,
  respectively.
- If a message body contains 8-bit bytes, post(8) uses SMTP 8BITMIME if the
  server supports it.  If not, post fails with a message to the user to
  encode the message for 7-bit transport.
- Fewer lseek(2)s will be used when reading headers in the common case.
- ./configure's --enable-debug has been removed;  it did nothing.
- configure now defaults to enabling each of TLS and Cyrus SASL if the
  necessary headers and libraries are found.
- Moved build_nmh to top-level directory.
- Better error reporting for connections to network services.

---------
BUG FIXES
---------

- The format scanner no longer subtracts 1 from the width.  This has the
  effect of no longer counting the trailing newline in the output of
  scan(1), inc(1), and the other programs that rely on the format scanner.
- The first character of some very short (less than 4 characters) message
  bodies is no longer dropped.
- Single-character headers can be reliably formatted, etc., instead of
  apparently being missing.
- mhfixmsg now adds a Content-Transfer-Encoding header at the message level,
  if needed after decoding text parts.
- mhbuild now checks whether all text parts need a Content-Transfer-Encoding
  header, not just those with a character set not specified.
- mhbuild no longer parses lines that start with # as directives with
  -nodirectives.
- repl now makes sure that any Fcc header in a replied-to message is not
  copied into the outgoing draft by default, and that the -fcc switch
  actually works in the absence of a Fcc header in the replied-to message.
- A Content-ID is generated for message/external-body entities as required
  by RFC 2045, even if -nocontentid is supplied to mhbuild.
- post will now expand aliases on a "From" line when doing a BCC [Bug #51098].
- scan can now handle empty files without violating an assert [Bug #51693].
- An error when writing an error message, e.g. EPIPE, no longer causes
  recursion until the stack is exhausted.

-------------------
DEPRECATED FEATURES
-------------------

- Support for the MHPDEBUG environment variable is deprecated and will be
  removed from a future nmh release.  Instead, use the -debug switch to pick.
- With the move of support binaries from ${libdir} to ${libexecdir}/nmh, the
  mostly undocumented 'libdir' mhparam(1) component has been replaced by a
  new 'libexecdir' component.  'libdir' will be removed in a future release.

-----------------
OBSOLETE FEATURES
-----------------

- The undocumented -queue switch to post was deprecated in nmh 1.6, and was
  removed in this release.
- conflict(8) was deprecated in nmh 1.6, and was removed in this release.
- mhtest(8) was deprecated in nmh 1.6, and was removed in this release.
- msh(1) was deprecated in nmh 1.6, and was removed in this release.
- Support in alias files for the the "*" address-group (everyone) was
  deprecated in nmh 1.6, and was removed in this release.
- Support for multiple hostnames in the "servers" entry of mts.conf has
  been removed.
- Support in alias files for expanding aliases based on group membership
  (=) and primary group (+) has been removed.

As always, feedback is welcome.


(leot)
diff -r1.92 -r1.93 pkgsrc/mail/nmh/Makefile
diff -r1.9 -r1.10 pkgsrc/mail/nmh/PLIST
diff -r1.19 -r1.20 pkgsrc/mail/nmh/distinfo
diff -r1.4 -r1.5 pkgsrc/mail/nmh/options.mk
diff -r1.8 -r1.9 pkgsrc/mail/nmh/patches/patch-ca
diff -r1.7 -r1.8 pkgsrc/mail/nmh/patches/patch-cd

cvs diff -r1.92 -r1.93 pkgsrc/mail/nmh/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/nmh/Makefile 2016/03/05 11:28:49 1.92
+++ pkgsrc/mail/nmh/Makefile 2017/11/21 10:32:02 1.93
@@ -1,103 +1,96 @@ @@ -1,103 +1,96 @@
1# $NetBSD: Makefile,v 1.92 2016/03/05 11:28:49 jperkin Exp $ 1# $NetBSD: Makefile,v 1.93 2017/11/21 10:32:02 leot Exp $
2 2
3DISTNAME= nmh-1.6 3DISTNAME= nmh-1.7
4PKGREVISION= 5 
5CATEGORIES= mail 4CATEGORIES= mail
6MASTER_SITES= http://savannah.nongnu.org/download/nmh/ 5MASTER_SITES= https://download.savannah.nongnu.org/releases/nmh/
7 6
8MAINTAINER= leot@NetBSD.org 7MAINTAINER= leot@NetBSD.org
9HOMEPAGE= http://www.nongnu.org/nmh/ 8HOMEPAGE= http://www.nongnu.org/nmh/
10COMMENT= Cleaned up MH mailer suite 9COMMENT= Cleaned up MH mailer suite
11LICENSE= modified-bsd 10LICENSE= modified-bsd
12 11
13CONFLICTS= ja-mh-[0-9]* 12CONFLICTS= ja-mh-[0-9]*
14CONFLICTS+= ja-mh6-[0-9]* 13CONFLICTS+= ja-mh6-[0-9]*
15 14
16USE_TOOLS+= lex 15USE_TOOLS+= lex
17 16
18# We choose DOT_LOCKING in our patches because ".lock" files are 
19# the most common locking mechanism supported by mail software. 
20# It also works well over NFS. 
21 
22# Locks supported by `mail.local' are ".lock" and flock(2). 
23 
24.include "../../mk/bsd.prefs.mk" 17.include "../../mk/bsd.prefs.mk"
25# Avoids SEGV in nmh's private version of strcasecmp() under gcc4 
26.if !empty(PKGSRC_COMPILER:Mgcc*) 
27CFLAGS+= -O1 
28.endif 
29 18
30.include "options.mk" 19.include "options.mk"
31 20
32# Mail Transport Agent - either "smtp" or "sendmail" 21# Mail Transport Agent - either "smtp" or "sendmail"
33NMH_MTA?= smtp 22NMH_MTA?= smtp
34 23
35GNU_CONFIGURE= yes 24GNU_CONFIGURE= yes
36 25
37GNU_CONFIGURE_LIBDIR= ${PREFIX}/libexec/nmh 26GNU_CONFIGURE_LIBDIR= ${PREFIX}/libexec/nmh
38CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 27CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
39CONFIGURE_ARGS+= --with-mts=${NMH_MTA:Q} 28CONFIGURE_ARGS+= --with-mts=${NMH_MTA:Q}
40CONFIGURE_ARGS+= --without-readline 29CONFIGURE_ARGS+= --without-readline
41 30
42DOCDIR= share/doc/nmh 31DOCDIR= share/doc/nmh
43EGDIR= ${PREFIX}/share/examples/nmh 32EGDIR= ${PREFIX}/share/examples/nmh
44INSTALLATION_DIRS= ${DOCDIR} ${EGDIR} 33INSTALLATION_DIRS= ${DOCDIR} ${EGDIR}
45 34
46BUILD_DEFS+= NMH_MTA NMH_EDITOR NMH_PAGER NMH_HASH_BACKUP 35BUILD_DEFS+= NMH_MTA NMH_EDITOR NMH_PAGER NMH_HASH_BACKUP PKG_SYSCONFBASE
47 36
48PKG_SYSCONFSUBDIR= nmh 37PKG_SYSCONFSUBDIR= nmh
49CONF_FILES= # empty 38CONF_FILES= # empty
50.for f in MailAliases \ 39.for f in MailAliases \
51 components \ 40 components \
52 digestcomps \ 41 digestcomps \
53 distcomps \ 42 distcomps \
54 forwcomps \ 43 forwcomps \
 44 mhical.12hour \
 45 mhical.24hour \
55 mhl.body \ 46 mhl.body \
56 mhl.digest \ 47 mhl.digest \
57 mhl.format \ 48 mhl.format \
58 mhl.forward \ 49 mhl.forward \
59 mhl.headers \ 50 mhl.headers \
60 mhl.reply \ 51 mhl.reply \
 52 mhl.replywithoutbody \
61 mhn.defaults \ 53 mhn.defaults \
62 mts.conf \ 54 mts.conf \
63 rcvdistcomps \ 55 rcvdistcomps \
64 rcvdistcomps.outbox \ 56 rcvdistcomps.outbox \
65 replcomps \ 57 replcomps \
66 replgroupcomps \ 58 replgroupcomps \
 59 rmmproc.messageid \
67 scan.MMDDYY \ 60 scan.MMDDYY \
68 scan.YYYYMMDD \ 61 scan.YYYYMMDD \
69 scan.default \ 62 scan.default \
70 scan.mailx \ 63 scan.mailx \
71 scan.nomime \ 64 scan.nomime \
72 scan.size \ 65 scan.size \
73 scan.time \ 66 scan.time \
74 scan.timely \ 67 scan.timely \
75 scan.unseen 68 scan.unseen
76CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} 69CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
77.endfor 70.endfor
78 71
79# The configure script checks for arc4random(), but the program uses 72# The configure script checks for arc4random(), but the program uses
80# arc4random_buf(); netbsd-5 (and presumably earlier) and some Darwin 73# arc4random_buf(); netbsd-5 (and presumably earlier) and some Darwin
81# versions has the one but not the other. Just disable it, because all 74# versions has the one but not the other. Just disable it, because all
82# it's using the randomness for is message-ids. 75# it's using the randomness for is message-ids.
83.if !empty(MACHINE_PLATFORM:MNetBSD-[1-5].*-*) || \ 76.if !empty(MACHINE_PLATFORM:MNetBSD-[1-5].*-*) || \
84 !empty(MACHINE_PLATFORM:MDarwin-[1-9].*-*) || \ 77 !empty(MACHINE_PLATFORM:MDarwin-[1-9].*-*) || \
85 !empty(MACHINE_PLATFORM:MDarwin-1[0-2].*-*) 78 !empty(MACHINE_PLATFORM:MDarwin-1[0-2].*-*)
86CONFIGURE_ENV+= ac_cv_func_arc4random=no 79CONFIGURE_ENV+= ac_cv_func_arc4random=no
87.endif 80.endif
88 81
 82TEST_TARGET= check
 83
89post-install: 84post-install:
90 ${INSTALL_DATA} ${FILESDIR}/mhn.defaults.dist \ 85 ${INSTALL_DATA} ${FILESDIR}/mhn.defaults.dist \
91 ${DESTDIR}${EGDIR}/mhn.defaults 86 ${DESTDIR}${EGDIR}/mhn.defaults
92 87
93.include "../../mk/bsd.prefs.mk" 
94 
95.if ${OPSYS} == "Linux" 88.if ${OPSYS} == "Linux"
96.include "../../databases/gdbm_compat/buildlink3.mk" 89.include "../../databases/gdbm_compat/buildlink3.mk"
97CONFIGURE_ARGS+= --with-ndbm='gdbm_compat -lgdbm' 90CONFIGURE_ARGS+= --with-ndbm='gdbm_compat -lgdbm'
98CONFIGURE_ARGS+= --with-ndbmheader=ndbm.h 91CONFIGURE_ARGS+= --with-ndbmheader=ndbm.h
99.endif 92.endif
100 93
101.include "../../converters/libiconv/buildlink3.mk" 94.include "../../converters/libiconv/buildlink3.mk"
102.include "../../mk/terminfo.buildlink3.mk" 95.include "../../mk/terminfo.buildlink3.mk"
103.include "../../mk/bsd.pkg.mk" 96.include "../../mk/bsd.pkg.mk"

cvs diff -r1.9 -r1.10 pkgsrc/mail/nmh/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/nmh/PLIST 2014/09/06 16:07:43 1.9
+++ pkgsrc/mail/nmh/PLIST 2017/11/21 10:32:02 1.10
@@ -1,65 +1,64 @@ @@ -1,65 +1,64 @@
1@comment $NetBSD: PLIST,v 1.9 2014/09/06 16:07:43 schnoebe Exp $ 1@comment $NetBSD: PLIST,v 1.10 2017/11/21 10:32:02 leot Exp $
2bin/ali 2bin/ali
3bin/anno 3bin/anno
4bin/burst 4bin/burst
5bin/comp 5bin/comp
6bin/dist 6bin/dist
7bin/flist 7bin/flist
8bin/flists 8bin/flists
9bin/fmttest 9bin/fmttest
10bin/fnext 10bin/fnext
11bin/folder 11bin/folder
12bin/folders 12bin/folders
13bin/forw 13bin/forw
14bin/fprev 14bin/fprev
15bin/inc 15bin/inc
16bin/install-mh 16bin/install-mh
17bin/mark 17bin/mark
18bin/mhbuild 18bin/mhbuild
19bin/mhfixmsg 19bin/mhfixmsg
 20bin/mhical
20bin/mhlist 21bin/mhlist
 22bin/mhlogin
21bin/mhmail 23bin/mhmail
22bin/mhn 24bin/mhn
23bin/mhparam 25bin/mhparam
24bin/mhpath 26bin/mhpath
25bin/mhshow 27bin/mhshow
26bin/mhstore 28bin/mhstore
27bin/msgchk 29bin/msgchk
28bin/msh 
29bin/new 30bin/new
30bin/next 31bin/next
31bin/packf 32bin/packf
32bin/pick 33bin/pick
33bin/prev 34bin/prev
34bin/prompter 35bin/prompter
35bin/refile 36bin/refile
36bin/repl 37bin/repl
37bin/rmf 38bin/rmf
38bin/rmm 39bin/rmm
39bin/scan 40bin/scan
40bin/send 41bin/send
41bin/sendfiles 42bin/sendfiles
42bin/show 43bin/show
43bin/sortm 44bin/sortm
44bin/unseen 45bin/unseen
45bin/whatnow 46bin/whatnow
46bin/whom 47bin/whom
47libexec/nmh/ap 48libexec/nmh/ap
48libexec/nmh/conflict 
49libexec/nmh/dp 49libexec/nmh/dp
50libexec/nmh/fmtdump 50libexec/nmh/fmtdump
51libexec/nmh/mhl 51libexec/nmh/mhl
52libexec/nmh/mhtest 
53libexec/nmh/mkstemp 52libexec/nmh/mkstemp
54libexec/nmh/post 53libexec/nmh/post
55libexec/nmh/rcvdist 54libexec/nmh/rcvdist
56libexec/nmh/rcvpack 55libexec/nmh/rcvpack
57libexec/nmh/rcvstore 56libexec/nmh/rcvstore
58libexec/nmh/rcvtty 57libexec/nmh/rcvtty
59libexec/nmh/slocal 58libexec/nmh/slocal
60libexec/nmh/spost 59libexec/nmh/spost
61libexec/nmh/viamail 60libexec/nmh/viamail
62man/man1/ali.1 61man/man1/ali.1
63man/man1/anno.1 62man/man1/anno.1
64man/man1/burst.1 63man/man1/burst.1
65man/man1/comp.1 64man/man1/comp.1
@@ -68,36 +67,37 @@ man/man1/flist.1 @@ -68,36 +67,37 @@ man/man1/flist.1
68man/man1/flists.1 67man/man1/flists.1
69man/man1/fmttest.1 68man/man1/fmttest.1
70man/man1/fnext.1 69man/man1/fnext.1
71man/man1/folder.1 70man/man1/folder.1
72man/man1/folders.1 71man/man1/folders.1
73man/man1/forw.1 72man/man1/forw.1
74man/man1/fprev.1 73man/man1/fprev.1
75man/man1/inc.1 74man/man1/inc.1
76man/man1/install-mh.1 75man/man1/install-mh.1
77man/man1/mark.1 76man/man1/mark.1
78man/man1/mh-mkstemp.1 77man/man1/mh-mkstemp.1
79man/man1/mhbuild.1 78man/man1/mhbuild.1
80man/man1/mhfixmsg.1 79man/man1/mhfixmsg.1
 80man/man1/mhical.1
81man/man1/mhl.1 81man/man1/mhl.1
82man/man1/mhlist.1 82man/man1/mhlist.1
 83man/man1/mhlogin.1
83man/man1/mhmail.1 84man/man1/mhmail.1
84man/man1/mhn.1 85man/man1/mhn.1
85man/man1/mhparam.1 86man/man1/mhparam.1
86man/man1/mhpath.1 87man/man1/mhpath.1
87man/man1/mhshow.1 88man/man1/mhshow.1
88man/man1/mhstore.1 89man/man1/mhstore.1
89man/man1/msgchk.1 90man/man1/msgchk.1
90man/man1/msh.1 
91man/man1/new.1 91man/man1/new.1
92man/man1/next.1 92man/man1/next.1
93man/man1/packf.1 93man/man1/packf.1
94man/man1/pick.1 94man/man1/pick.1
95man/man1/prev.1 95man/man1/prev.1
96man/man1/prompter.1 96man/man1/prompter.1
97man/man1/rcvdist.1 97man/man1/rcvdist.1
98man/man1/rcvpack.1 98man/man1/rcvpack.1
99man/man1/rcvstore.1 99man/man1/rcvstore.1
100man/man1/rcvtty.1 100man/man1/rcvtty.1
101man/man1/refile.1 101man/man1/refile.1
102man/man1/repl.1 102man/man1/repl.1
103man/man1/rmf.1 103man/man1/rmf.1
@@ -111,75 +111,79 @@ man/man1/sortm.1 @@ -111,75 +111,79 @@ man/man1/sortm.1
111man/man1/unseen.1 111man/man1/unseen.1
112man/man1/whatnow.1 112man/man1/whatnow.1
113man/man1/whom.1 113man/man1/whom.1
114man/man5/mh-alias.5 114man/man5/mh-alias.5
115man/man5/mh-draft.5 115man/man5/mh-draft.5
116man/man5/mh-folders.5 116man/man5/mh-folders.5
117man/man5/mh-format.5 117man/man5/mh-format.5
118man/man5/mh-mail.5 118man/man5/mh-mail.5
119man/man5/mh-profile.5 119man/man5/mh-profile.5
120man/man5/mh-sequence.5 120man/man5/mh-sequence.5
121man/man5/mh-tailor.5 121man/man5/mh-tailor.5
122man/man5/mh_profile.5 122man/man5/mh_profile.5
123man/man5/mts.conf.5 123man/man5/mts.conf.5
 124man/man7/MH.7
124man/man7/mh-chart.7 125man/man7/mh-chart.7
125man/man7/mh-mime.7 126man/man7/mh-mime.7
126man/man7/nmh.7 127man/man7/nmh.7
127man/man8/ap.8 128man/man8/ap.8
128man/man8/conflict.8 
129man/man8/dp.8 129man/man8/dp.8
130man/man8/fmtdump.8 130man/man8/fmtdump.8
131man/man8/post.8 131man/man8/post.8
132share/doc/nmh/COMPLETION-BASH 
133share/doc/nmh/COMPLETION-TCSH 132share/doc/nmh/COMPLETION-TCSH
134share/doc/nmh/COMPLETION-ZSH 133share/doc/nmh/COMPLETION-ZSH
135share/doc/nmh/COPYRIGHT 134share/doc/nmh/COPYRIGHT
136share/doc/nmh/DIFFERENCES 135share/doc/nmh/DIFFERENCES
137share/doc/nmh/FAQ 136share/doc/nmh/FAQ
138share/doc/nmh/INSTALL 137share/doc/nmh/INSTALL
139share/doc/nmh/MAIL.FILTERING 138share/doc/nmh/MAIL.FILTERING
140share/doc/nmh/MAILING-LISTS 139share/doc/nmh/MAILING-LISTS
141share/doc/nmh/NEWS 140share/doc/nmh/NEWS
142share/doc/nmh/README 141share/doc/nmh/README
143share/doc/nmh/README-ATTACHMENTS 142share/doc/nmh/README-ATTACHMENTS
144share/doc/nmh/README-HOOKS 143share/doc/nmh/README-HOOKS
145share/doc/nmh/README-components 144share/doc/nmh/README-components
146share/doc/nmh/README-iCalendar 
147share/doc/nmh/README.SASL 145share/doc/nmh/README.SASL
148share/doc/nmh/README.about 146share/doc/nmh/README.about
149share/doc/nmh/README.developers 147share/doc/nmh/README.developers
150share/doc/nmh/README.manpages 148share/doc/nmh/README.manpages
151share/doc/nmh/TODO 149share/doc/nmh/TODO
152share/doc/nmh/VERSION 150share/doc/nmh/VERSION
153share/doc/nmh/contrib/build_nmh 151share/doc/nmh/contrib/localpostproc
154share/doc/nmh/contrib/ml 152share/doc/nmh/contrib/ml
 153share/doc/nmh/contrib/replaliases
155share/doc/nmh/contrib/replyfilter 154share/doc/nmh/contrib/replyfilter
156share/doc/nmh/contrib/vpick 155share/doc/nmh/contrib/vpick
157share/examples/nmh/MailAliases 156share/examples/nmh/MailAliases
 157share/examples/nmh/bash_completion_nmh
158share/examples/nmh/components 158share/examples/nmh/components
159share/examples/nmh/digestcomps 159share/examples/nmh/digestcomps
160share/examples/nmh/distcomps 160share/examples/nmh/distcomps
161share/examples/nmh/forwcomps 161share/examples/nmh/forwcomps
 162share/examples/nmh/mhical.12hour
 163share/examples/nmh/mhical.24hour
162share/examples/nmh/mhl.body 164share/examples/nmh/mhl.body
163share/examples/nmh/mhl.digest 165share/examples/nmh/mhl.digest
164share/examples/nmh/mhl.format 166share/examples/nmh/mhl.format
165share/examples/nmh/mhl.forward 167share/examples/nmh/mhl.forward
166share/examples/nmh/mhl.headers 168share/examples/nmh/mhl.headers
167share/examples/nmh/mhl.reply 169share/examples/nmh/mhl.reply
 170share/examples/nmh/mhl.replywithoutbody
168share/examples/nmh/mhn.defaults 171share/examples/nmh/mhn.defaults
169share/examples/nmh/mhshow.marker 172share/examples/nmh/mhshow.marker
170share/examples/nmh/mts.conf 173share/examples/nmh/mts.conf
171share/examples/nmh/rcvdistcomps 174share/examples/nmh/rcvdistcomps
172share/examples/nmh/rcvdistcomps.outbox 175share/examples/nmh/rcvdistcomps.outbox
173share/examples/nmh/replcomps 176share/examples/nmh/replcomps
174share/examples/nmh/replgroupcomps 177share/examples/nmh/replgroupcomps
 178share/examples/nmh/rmmproc.messageid
175share/examples/nmh/scan.MMDDYY 179share/examples/nmh/scan.MMDDYY
176share/examples/nmh/scan.YYYYMMDD 180share/examples/nmh/scan.YYYYMMDD
177share/examples/nmh/scan.curses 181share/examples/nmh/scan.curses
178share/examples/nmh/scan.default 182share/examples/nmh/scan.default
179share/examples/nmh/scan.highlighted 183share/examples/nmh/scan.highlighted
180share/examples/nmh/scan.mailx 184share/examples/nmh/scan.mailx
181share/examples/nmh/scan.nomime 185share/examples/nmh/scan.nomime
182share/examples/nmh/scan.size 186share/examples/nmh/scan.size
183share/examples/nmh/scan.time 187share/examples/nmh/scan.time
184share/examples/nmh/scan.timely 188share/examples/nmh/scan.timely
185share/examples/nmh/scan.unseen 189share/examples/nmh/scan.unseen

cvs diff -r1.19 -r1.20 pkgsrc/mail/nmh/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/nmh/distinfo 2015/11/03 23:27:11 1.19
+++ pkgsrc/mail/nmh/distinfo 2017/11/21 10:32:02 1.20
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.19 2015/11/03 23:27:11 agc Exp $ 1$NetBSD: distinfo,v 1.20 2017/11/21 10:32:02 leot Exp $
2 2
3SHA1 (nmh-1.6.tar.gz) = d424a7520c85abfdbd492f70cdae7fce51a88a7f 3SHA1 (nmh-1.7.tar.gz) = 626e4c759807fa0714a825bcc4f4c60ba9360ea5
4RMD160 (nmh-1.6.tar.gz) = 21efdf51df83f310ceac985cdc02b709d7edddf7 4RMD160 (nmh-1.7.tar.gz) = d0112f995e117b5723a73e6f363681674feb13f1
5SHA512 (nmh-1.6.tar.gz) = 03775e73f69eb21088e191f41a0bbc2e631956f0d496f87be97981ac2c85d8cbe0680e8ee7e37f97e79c34ccd814fca78f2684acfc8390e333a46c710fbdb2b7 5SHA512 (nmh-1.7.tar.gz) = 68394c23d776b066d50b75486c985eb59e8545d1f928d78c663be1cd28bf1f7af88fad30e9a7b6e3b80dda1fd6f04815c4b1a6accbf0e960e523742e335dec86
6Size (nmh-1.6.tar.gz) = 1197272 bytes 6Size (nmh-1.7.tar.gz) = 1391594 bytes
7SHA1 (patch-ca) = ebbd0c463bda8d67734c06d7ed75d5ab2a51cfa2 7SHA1 (patch-ca) = 8e3d655602d8b508f403e51b105e122818b50b7c
8SHA1 (patch-cd) = 2576f728e8d55cdbe533ae5fc05eac0cf5413ad4 8SHA1 (patch-cd) = 5a775091713bca2597a01fcd267d56e2a175588a

cvs diff -r1.4 -r1.5 pkgsrc/mail/nmh/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/nmh/options.mk 2012/08/31 02:09:49 1.4
+++ pkgsrc/mail/nmh/options.mk 2017/11/21 10:32:02 1.5
@@ -1,24 +1,37 @@ @@ -1,24 +1,37 @@
1# $NetBSD: options.mk,v 1.4 2012/08/31 02:09:49 schnoebe Exp $ 1# $NetBSD: options.mk,v 1.5 2017/11/21 10:32:02 leot Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.nmh 3PKG_OPTIONS_VAR= PKG_OPTIONS.nmh
4PKG_SUPPORTED_OPTIONS= nmh-backup-hash sasl tls 4PKG_SUPPORTED_OPTIONS= nmh-backup-hash oauth sasl tls
5 5
6.include "../../mk/bsd.options.mk" 6.include "../../mk/bsd.options.mk"
7 7
8### 8###
9### Prepend a "#" instead of a "," to the name of a message that is 9### Prepend a "#" instead of a "," to the name of a message that is
10### "removed" by rmm. 10### "removed" by rmm.
11### 11###
12.if !empty(PKG_OPTIONS:Mnmh-backup-hash) 12.if !empty(PKG_OPTIONS:Mnmh-backup-hash)
13CONFIGURE_ARGS+= --with-hash-backup 13CONFIGURE_ARGS+= --with-hash-backup
 14.else
 15CONFIGURE_ARGS+= --without-hash-backup
 16.endif
 17
 18.if !empty(PKG_OPTIONS:Moauth)
 19CONFIGURE_ARGS+= --with-oauth
 20.include "../../www/curl/buildlink3.mk"
 21.else
 22CONFIGURE_ARGS+= --without-oauth
14.endif 23.endif
15 24
16.if !empty(PKG_OPTIONS:Msasl) 25.if !empty(PKG_OPTIONS:Msasl)
17CONFIGURE_ARGS+= --with-cyrus-sasl 26CONFIGURE_ARGS+= --with-cyrus-sasl
18.include "../../security/cyrus-sasl/buildlink3.mk" 27.include "../../security/cyrus-sasl/buildlink3.mk"
 28.else
 29CONFIGURE_ARGS+= --without-cyrus-sasl
19.endif 30.endif
20 31
21.if !empty(PKG_OPTIONS:Mtls) 32.if !empty(PKG_OPTIONS:Mtls)
22CONFIGURE_ARGS+= --with-tls 33CONFIGURE_ARGS+= --with-tls
23.include "../../security/openssl/buildlink3.mk" 34.include "../../security/openssl/buildlink3.mk"
 35.else
 36CONFIGURE_ARGS+= --with-tls
24.endif 37.endif

cvs diff -r1.8 -r1.9 pkgsrc/mail/nmh/patches/patch-ca (expand / switch to unified diff)

--- pkgsrc/mail/nmh/patches/patch-ca 2014/09/06 16:07:43 1.8
+++ pkgsrc/mail/nmh/patches/patch-ca 2017/11/21 10:32:02 1.9
@@ -1,62 +1,88 @@ @@ -1,62 +1,88 @@
1$NetBSD: patch-ca,v 1.8 2014/09/06 16:07:43 schnoebe Exp $ 1$NetBSD: patch-ca,v 1.9 2017/11/21 10:32:02 leot Exp $
2 2
3install config files into share/examples 3- Introduce $egdir and install all configuration files in it, in order to
 4 properly use CONF_FILES to manage configuration files for pkgsrc.
 5- Adjust TEST_ENVIRONMENT in order to use $egdir instead of $nmhetcdir
 6 and adjust $nmhetcdirinst to fix the `mhparam etcdir' test.
4 7
5--- Makefile.in.orig 2014-06-15 20:34:16.000000000 +0000 8--- Makefile.in.orig 2017-08-03 02:22:59.000000000 +0000
6+++ Makefile.in 9+++ Makefile.in
7@@ -819,6 +819,7 @@ smtpservers = @smtpservers@ 10@@ -864,6 +864,7 @@ smtpserver = @smtpserver@
8 srcdir = @srcdir@ 11 srcdir = @srcdir@
9 supported_locks = @supported_locks@ 12 supported_locks = @supported_locks@
10 sysconfdir = @sysconfdir@ 13 sysconfdir = @sysconfdir@
11+egdir = @prefix@/share/examples/nmh 14+egdir = @prefix@/share/examples/nmh
12 target_alias = @target_alias@ 15 target_alias = @target_alias@
13 top_build_prefix = @top_build_prefix@ 16 top_build_prefix = @top_build_prefix@
14 top_builddir = @top_builddir@ 17 top_builddir = @top_builddir@
15@@ -4030,18 +4031,18 @@ uninstall-dist_docDATA: 18@@ -881,8 +882,8 @@ TESTS_ENVIRONMENT = MH_OBJ_DIR="@abs_bui
16 dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) 19 CURL_USER_AGENT='@CURL_USER_AGENT@' \
17 install-dist_sysconfDATA: $(dist_sysconf_DATA) 20 MH_TEST_DIR=`cd "@abs_builddir@" && pwd -P`/test/testdir \
 21 nmhlibexecdir="$(nmhlibexecdir)" bindir="$(bindir)" \
 22- mandir="$(mandir)" nmhetcdir="$(nmhetcdir)" \
 23- nmhetcdirinst="@nmhetcdirinst@$(nmhetcdir)" \
 24+ mandir="$(mandir)" nmhetcdir="$(egdir)" \
 25+ nmhetcdirinst="$(nmhetcdir)" \
 26 supported_locks="$(supported_locks)" \
 27 default_locking="${default_locking}" \
 28 MULTIBYTE_ENABLED=$(MULTIBYTE_ENABLED) \
 29@@ -4625,46 +4626,46 @@ uninstall-dist_docs_contribDATA:
 30 dir='$(DESTDIR)$(docs_contribdir)'; $(am__uninstall_files_from_dir)
 31 install-dist_nmhetcDATA: $(dist_nmhetc_DATA)
18 @$(NORMAL_INSTALL) 32 @$(NORMAL_INSTALL)
19- @list='$(dist_sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ 33- @list='$(dist_nmhetc_DATA)'; test -n "$(nmhetcdir)" || list=; \
20+ @list='$(dist_sysconf_DATA)'; test -n "$(egdir)" || list=; \ 34+ @list='$(dist_nmhetc_DATA)'; test -n "$(egdir)" || list=; \
21 if test -n "$$list"; then \ 35 if test -n "$$list"; then \
22- echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \ 36- echo " $(MKDIR_P) '$(DESTDIR)$(nmhetcdir)'"; \
23- $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \ 37- $(MKDIR_P) "$(DESTDIR)$(nmhetcdir)" || exit 1; \
24+ echo " $(MKDIR_P) '$(DESTDIR)$(egdir)'"; \ 38+ echo " $(MKDIR_P) '$(DESTDIR)$(egdir)'"; \
25+ $(MKDIR_P) "$(DESTDIR)$(egdir)" || exit 1; \ 39+ $(MKDIR_P) "$(DESTDIR)$(egdir)" || exit 1; \
26 fi; \ 40 fi; \
27 for p in $$list; do \ 41 for p in $$list; do \
28 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ 42 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
29 echo "$$d$$p"; \ 43 echo "$$d$$p"; \
30 done | $(am__base_list) | \ 44 done | $(am__base_list) | \
31 while read files; do \ 45 while read files; do \
32- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \ 46- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(nmhetcdir)'"; \
33- $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \ 47- $(INSTALL_DATA) $$files "$(DESTDIR)$(nmhetcdir)" || exit $$?; \
34+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(egdir)'"; \ 48+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(egdir)'"; \
35+ $(INSTALL_DATA) $$files "$(DESTDIR)$(egdir)" || exit $$?; \ 49+ $(INSTALL_DATA) $$files "$(DESTDIR)$(egdir)" || exit $$?; \
36 done 50 done
37  51
38 uninstall-dist_sysconfDATA: 52 uninstall-dist_nmhetcDATA:
39@@ -4051,18 +4052,18 @@ uninstall-dist_sysconfDATA: 53 @$(NORMAL_UNINSTALL)
40 dir='$(DESTDIR)$(sysconfdir)'; $(am__uninstall_files_from_dir) 54- @list='$(dist_nmhetc_DATA)'; test -n "$(nmhetcdir)" || list=; \
41 install-sysconfDATA: $(sysconf_DATA) 55+ @list='$(dist_nmhetc_DATA)'; test -n "$(egdir)" || list=; \
 56 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 57 dir='$(DESTDIR)$(nmhetcdir)'; $(am__uninstall_files_from_dir)
 58 install-nmhetcDATA: $(nmhetc_DATA)
42 @$(NORMAL_INSTALL) 59 @$(NORMAL_INSTALL)
43- @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ 60- @list='$(nmhetc_DATA)'; test -n "$(nmhetcdir)" || list=; \
44+ @list='$(sysconf_DATA)'; test -n "$(egdir)" || list=; \ 61+ @list='$(nmhetc_DATA)'; test -n "$(egdir)" || list=; \
45 if test -n "$$list"; then \ 62 if test -n "$$list"; then \
46- echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \ 63- echo " $(MKDIR_P) '$(DESTDIR)$(nmhetcdir)'"; \
47- $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \ 64- $(MKDIR_P) "$(DESTDIR)$(nmhetcdir)" || exit 1; \
48+ echo " $(MKDIR_P) '$(DESTDIR)$(egdir)'"; \ 65+ echo " $(MKDIR_P) '$(DESTDIR)$(egdir)'"; \
49+ $(MKDIR_P) "$(DESTDIR)$(egdir)" || exit 1; \ 66+ $(MKDIR_P) "$(DESTDIR)$(egdir)" || exit 1; \
50 fi; \ 67 fi; \
51 for p in $$list; do \ 68 for p in $$list; do \
52 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ 69 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
53 echo "$$d$$p"; \ 70 echo "$$d$$p"; \
54 done | $(am__base_list) | \ 71 done | $(am__base_list) | \
55 while read files; do \ 72 while read files; do \
56- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \ 73- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(nmhetcdir)'"; \
57- $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \ 74- $(INSTALL_DATA) $$files "$(DESTDIR)$(nmhetcdir)" || exit $$?; \
58+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(egdir)'"; \ 75+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(egdir)'"; \
59+ $(INSTALL_DATA) $$files "$(DESTDIR)$(egdir)" || exit $$?; \ 76+ $(INSTALL_DATA) $$files "$(DESTDIR)$(egdir)" || exit $$?; \
60 done 77 done
61  78
62 uninstall-sysconfDATA: 79 uninstall-nmhetcDATA:
 80 @$(NORMAL_UNINSTALL)
 81- @list='$(nmhetc_DATA)'; test -n "$(nmhetcdir)" || list=; \
 82+ @list='$(nmhetc_DATA)'; test -n "$(egdir)" || list=; \
 83 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 84- dir='$(DESTDIR)$(nmhetcdir)'; $(am__uninstall_files_from_dir)
 85+ dir='$(DESTDIR)$(egdir)'; $(am__uninstall_files_from_dir)
 86
 87 ID: $(am__tagged_files)
 88 $(am__define_uniq_tagged_files); mkid -fID $$unique

cvs diff -r1.7 -r1.8 pkgsrc/mail/nmh/patches/patch-cd (expand / switch to unified diff)

--- pkgsrc/mail/nmh/patches/patch-cd 2014/09/06 16:07:43 1.7
+++ pkgsrc/mail/nmh/patches/patch-cd 2017/11/21 10:32:02 1.8
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-cd,v 1.7 2014/09/06 16:07:43 schnoebe Exp $ 1$NetBSD: patch-cd,v 1.8 2017/11/21 10:32:02 leot Exp $
2 2
3make sure a time_t fits in 3make sure a time_t fits in
4 4
5--- sbr/fmt_scan.c.orig 2014-06-15 20:30:40.000000000 +0000 5--- sbr/fmt_scan.c.orig 2017-05-17 01:03:54.000000000 +0000
6+++ sbr/fmt_scan.c 6+++ sbr/fmt_scan.c
7@@ -371,7 +371,7 @@ fmt_scan (struct format *format, char *s 7@@ -365,7 +365,7 @@ fmt_scan (struct format *format, charstr
8 char *savestr = NULL, *str = NULL; 8 char *savestr, *str;
9 char buffer[BUFSIZ], buffer2[BUFSIZ]; 9 char buffer[NMH_BUFSIZ], buffer2[NMH_BUFSIZ];
10 int i, c, ljust, n; 10 int i, c, rjust;
11- int value = 0; 11- int value;
12+ long long value = 0; 12+ long long value;
13 time_t t; 13 time_t t;
 14 size_t max;
14 struct format *fmt; 15 struct format *fmt;
15 struct comp *comp;