pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
nmh: Remove nmh, used to update mail/nmh
Module Name: pkgsrc-wip
Committed By: Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By: leot
Date: Tue Nov 21 11:35:41 2017 +0100
Changeset: d5fb93a45a282642b1b1fa7864d90d97bb40b735
Modified Files:
Makefile
Removed Files:
nmh/COMMIT_MSG
nmh/DESCR
nmh/Makefile
nmh/PLIST
nmh/distinfo
nmh/files/mhn.defaults.dist
nmh/options.mk
nmh/patches/patch-ca
nmh/patches/patch-cd
Log Message:
nmh: Remove nmh, used to update mail/nmh
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d5fb93a45a282642b1b1fa7864d90d97bb40b735
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 -
nmh/COMMIT_MSG | 198 --------------------------------------------
nmh/DESCR | 10 ---
nmh/Makefile | 96 ---------------------
nmh/PLIST | 189 ------------------------------------------
nmh/distinfo | 8 --
nmh/files/mhn.defaults.dist | 14 ----
nmh/options.mk | 37 ---------
nmh/patches/patch-ca | 88 --------------------
nmh/patches/patch-cd | 15 ----
10 files changed, 656 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 11cdf617c7..24eaf60865 100644
--- a/Makefile
+++ b/Makefile
@@ -2166,7 +2166,6 @@ SUBDIR+= ninka
SUBDIR+= nios2-gdb
SUBDIR+= nitrogen
SUBDIR+= njb-sharp
-SUBDIR+= nmh
SUBDIR+= nnrpd
SUBDIR+= nodau
SUBDIR+= nodm
diff --git a/nmh/COMMIT_MSG b/nmh/COMMIT_MSG
deleted file mode 100644
index 9923c03e60..0000000000
--- a/nmh/COMMIT_MSG
+++ /dev/null
@@ -1,198 +0,0 @@
-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.
diff --git a/nmh/DESCR b/nmh/DESCR
deleted file mode 100644
index 9bb225a989..0000000000
--- a/nmh/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-nmh (new MH) is a powerful electronic mail handling system. It was
-originally based on version 6.8.3 of the MH message system developed by
-the RAND Corporation and the University of California. It is intended
-to be a (mostly) compatible drop-in replacement for MH.
-
-nmh consists of a collection of fairly simple single-purpose programs
-to send, receive, save, retrieve, and manipulate e-mail messages. Since
-nmh is a suite rather than a single monolithic program, you may freely
-intersperse nmh commands with other commands at your shell prompt,
-or write custom scripts which use these commands in flexible ways.
diff --git a/nmh/Makefile b/nmh/Makefile
deleted file mode 100644
index 5ef472132b..0000000000
--- a/nmh/Makefile
+++ /dev/null
@@ -1,96 +0,0 @@
-# $NetBSD: Makefile,v 1.92 2016/03/05 11:28:49 jperkin Exp $
-
-DISTNAME= nmh-1.7
-CATEGORIES= mail
-MASTER_SITES= https://download.savannah.nongnu.org/releases/nmh/
-
-MAINTAINER= leot%NetBSD.org@localhost
-HOMEPAGE= http://www.nongnu.org/nmh/
-COMMENT= Cleaned up MH mailer suite
-LICENSE= modified-bsd
-
-CONFLICTS= ja-mh-[0-9]*
-CONFLICTS+= ja-mh6-[0-9]*
-
-USE_TOOLS+= lex
-
-.include "../../mk/bsd.prefs.mk"
-
-.include "options.mk"
-
-# Mail Transport Agent - either "smtp" or "sendmail"
-NMH_MTA?= smtp
-
-GNU_CONFIGURE= yes
-
-GNU_CONFIGURE_LIBDIR= ${PREFIX}/libexec/nmh
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
-CONFIGURE_ARGS+= --with-mts=${NMH_MTA:Q}
-CONFIGURE_ARGS+= --without-readline
-
-DOCDIR= share/doc/nmh
-EGDIR= ${PREFIX}/share/examples/nmh
-INSTALLATION_DIRS= ${DOCDIR} ${EGDIR}
-
-BUILD_DEFS+= NMH_MTA NMH_EDITOR NMH_PAGER NMH_HASH_BACKUP PKG_SYSCONFBASE
-
-PKG_SYSCONFSUBDIR= nmh
-CONF_FILES= # empty
-.for f in MailAliases \
- components \
- digestcomps \
- distcomps \
- forwcomps \
- mhical.12hour \
- mhical.24hour \
- mhl.body \
- mhl.digest \
- mhl.format \
- mhl.forward \
- mhl.headers \
- mhl.reply \
- mhl.replywithoutbody \
- mhn.defaults \
- mts.conf \
- rcvdistcomps \
- rcvdistcomps.outbox \
- replcomps \
- replgroupcomps \
- rmmproc.messageid \
- scan.MMDDYY \
- scan.YYYYMMDD \
- scan.default \
- scan.mailx \
- scan.nomime \
- scan.size \
- scan.time \
- scan.timely \
- scan.unseen
-CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
-.endfor
-
-# The configure script checks for arc4random(), but the program uses
-# arc4random_buf(); netbsd-5 (and presumably earlier) and some Darwin
-# versions has the one but not the other. Just disable it, because all
-# it's using the randomness for is message-ids.
-.if !empty(MACHINE_PLATFORM:MNetBSD-[1-5].*-*) || \
- !empty(MACHINE_PLATFORM:MDarwin-[1-9].*-*) || \
- !empty(MACHINE_PLATFORM:MDarwin-1[0-2].*-*)
-CONFIGURE_ENV+= ac_cv_func_arc4random=no
-.endif
-
-TEST_TARGET= check
-
-post-install:
- ${INSTALL_DATA} ${FILESDIR}/mhn.defaults.dist \
- ${DESTDIR}${EGDIR}/mhn.defaults
-
-.if ${OPSYS} == "Linux"
-.include "../../databases/gdbm_compat/buildlink3.mk"
-CONFIGURE_ARGS+= --with-ndbm='gdbm_compat -lgdbm'
-CONFIGURE_ARGS+= --with-ndbmheader=ndbm.h
-.endif
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../mk/terminfo.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/nmh/PLIST b/nmh/PLIST
deleted file mode 100644
index 632b2adfb5..0000000000
--- a/nmh/PLIST
+++ /dev/null
@@ -1,189 +0,0 @@
-@comment $NetBSD$
-bin/ali
-bin/anno
-bin/burst
-bin/comp
-bin/dist
-bin/flist
-bin/flists
-bin/fmttest
-bin/fnext
-bin/folder
-bin/folders
-bin/forw
-bin/fprev
-bin/inc
-bin/install-mh
-bin/mark
-bin/mhbuild
-bin/mhfixmsg
-bin/mhical
-bin/mhlist
-bin/mhlogin
-bin/mhmail
-bin/mhn
-bin/mhparam
-bin/mhpath
-bin/mhshow
-bin/mhstore
-bin/msgchk
-bin/new
-bin/next
-bin/packf
-bin/pick
-bin/prev
-bin/prompter
-bin/refile
-bin/repl
-bin/rmf
-bin/rmm
-bin/scan
-bin/send
-bin/sendfiles
-bin/show
-bin/sortm
-bin/unseen
-bin/whatnow
-bin/whom
-libexec/nmh/ap
-libexec/nmh/dp
-libexec/nmh/fmtdump
-libexec/nmh/mhl
-libexec/nmh/mkstemp
-libexec/nmh/post
-libexec/nmh/rcvdist
-libexec/nmh/rcvpack
-libexec/nmh/rcvstore
-libexec/nmh/rcvtty
-libexec/nmh/slocal
-libexec/nmh/spost
-libexec/nmh/viamail
-man/man1/ali.1
-man/man1/anno.1
-man/man1/burst.1
-man/man1/comp.1
-man/man1/dist.1
-man/man1/flist.1
-man/man1/flists.1
-man/man1/fmttest.1
-man/man1/fnext.1
-man/man1/folder.1
-man/man1/folders.1
-man/man1/forw.1
-man/man1/fprev.1
-man/man1/inc.1
-man/man1/install-mh.1
-man/man1/mark.1
-man/man1/mh-mkstemp.1
-man/man1/mhbuild.1
-man/man1/mhfixmsg.1
-man/man1/mhical.1
-man/man1/mhl.1
-man/man1/mhlist.1
-man/man1/mhlogin.1
-man/man1/mhmail.1
-man/man1/mhn.1
-man/man1/mhparam.1
-man/man1/mhpath.1
-man/man1/mhshow.1
-man/man1/mhstore.1
-man/man1/msgchk.1
-man/man1/new.1
-man/man1/next.1
-man/man1/packf.1
-man/man1/pick.1
-man/man1/prev.1
-man/man1/prompter.1
-man/man1/rcvdist.1
-man/man1/rcvpack.1
-man/man1/rcvstore.1
-man/man1/rcvtty.1
-man/man1/refile.1
-man/man1/repl.1
-man/man1/rmf.1
-man/man1/rmm.1
-man/man1/scan.1
-man/man1/send.1
-man/man1/sendfiles.1
-man/man1/show.1
-man/man1/slocal.1
-man/man1/sortm.1
-man/man1/unseen.1
-man/man1/whatnow.1
-man/man1/whom.1
-man/man5/mh-alias.5
-man/man5/mh-draft.5
-man/man5/mh-folders.5
-man/man5/mh-format.5
-man/man5/mh-mail.5
-man/man5/mh-profile.5
-man/man5/mh-sequence.5
-man/man5/mh-tailor.5
-man/man5/mh_profile.5
-man/man5/mts.conf.5
-man/man7/MH.7
-man/man7/mh-chart.7
-man/man7/mh-mime.7
-man/man7/nmh.7
-man/man8/ap.8
-man/man8/dp.8
-man/man8/fmtdump.8
-man/man8/post.8
-share/doc/nmh/COMPLETION-TCSH
-share/doc/nmh/COMPLETION-ZSH
-share/doc/nmh/COPYRIGHT
-share/doc/nmh/DIFFERENCES
-share/doc/nmh/FAQ
-share/doc/nmh/INSTALL
-share/doc/nmh/MAIL.FILTERING
-share/doc/nmh/MAILING-LISTS
-share/doc/nmh/NEWS
-share/doc/nmh/README
-share/doc/nmh/README-ATTACHMENTS
-share/doc/nmh/README-HOOKS
-share/doc/nmh/README-components
-share/doc/nmh/README.SASL
-share/doc/nmh/README.about
-share/doc/nmh/README.developers
-share/doc/nmh/README.manpages
-share/doc/nmh/TODO
-share/doc/nmh/VERSION
-share/doc/nmh/contrib/localpostproc
-share/doc/nmh/contrib/ml
-share/doc/nmh/contrib/replaliases
-share/doc/nmh/contrib/replyfilter
-share/doc/nmh/contrib/vpick
-share/examples/nmh/MailAliases
-share/examples/nmh/bash_completion_nmh
-share/examples/nmh/components
-share/examples/nmh/digestcomps
-share/examples/nmh/distcomps
-share/examples/nmh/forwcomps
-share/examples/nmh/mhical.12hour
-share/examples/nmh/mhical.24hour
-share/examples/nmh/mhl.body
-share/examples/nmh/mhl.digest
-share/examples/nmh/mhl.format
-share/examples/nmh/mhl.forward
-share/examples/nmh/mhl.headers
-share/examples/nmh/mhl.reply
-share/examples/nmh/mhl.replywithoutbody
-share/examples/nmh/mhn.defaults
-share/examples/nmh/mhshow.marker
-share/examples/nmh/mts.conf
-share/examples/nmh/rcvdistcomps
-share/examples/nmh/rcvdistcomps.outbox
-share/examples/nmh/replcomps
-share/examples/nmh/replgroupcomps
-share/examples/nmh/rmmproc.messageid
-share/examples/nmh/scan.MMDDYY
-share/examples/nmh/scan.YYYYMMDD
-share/examples/nmh/scan.curses
-share/examples/nmh/scan.default
-share/examples/nmh/scan.highlighted
-share/examples/nmh/scan.mailx
-share/examples/nmh/scan.nomime
-share/examples/nmh/scan.size
-share/examples/nmh/scan.time
-share/examples/nmh/scan.timely
-share/examples/nmh/scan.unseen
diff --git a/nmh/distinfo b/nmh/distinfo
deleted file mode 100644
index 22bada3e76..0000000000
--- a/nmh/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.19 2015/11/03 23:27:11 agc Exp $
-
-SHA1 (nmh-1.7.tar.gz) = 626e4c759807fa0714a825bcc4f4c60ba9360ea5
-RMD160 (nmh-1.7.tar.gz) = d0112f995e117b5723a73e6f363681674feb13f1
-SHA512 (nmh-1.7.tar.gz) = 68394c23d776b066d50b75486c985eb59e8545d1f928d78c663be1cd28bf1f7af88fad30e9a7b6e3b80dda1fd6f04815c4b1a6accbf0e960e523742e335dec86
-Size (nmh-1.7.tar.gz) = 1391594 bytes
-SHA1 (patch-ca) = 8e3d655602d8b508f403e51b105e122818b50b7c
-SHA1 (patch-cd) = 5a775091713bca2597a01fcd267d56e2a175588a
diff --git a/nmh/files/mhn.defaults.dist b/nmh/files/mhn.defaults.dist
deleted file mode 100644
index 48980d3a30..0000000000
--- a/nmh/files/mhn.defaults.dist
+++ /dev/null
@@ -1,14 +0,0 @@
-#: $NetBSD: mhn.defaults.dist,v 1.1 2000/03/02 05:11:44 kim Exp $
-#:
-mhstore-store-application/PostScript: %m%P.ps
-mhstore-store-text: %m%P.txt
-mhstore-store-text/richtext: %m%P.rt
-mhstore-store-video/mpeg: %m%P.mpg
-#:
-#: If you install more packages you could enable these
-#:
-#: mhshow-show-application/PostScript: %plpr -Pps
-#: mhshow-show-application/x-ivs: %pivs_replay -o '%F'
-#: mhshow-show-image: %pxv '%f'
-#: mhshow-show-text/richtext: %prichtext -p '%F'
-#: mhshow-show-video/mpeg: %pmpeg_play '%f'" >> $TMP
diff --git a/nmh/options.mk b/nmh/options.mk
deleted file mode 100644
index d05e7d9829..0000000000
--- a/nmh/options.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: options.mk,v 1.4 2012/08/31 02:09:49 schnoebe Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.nmh
-PKG_SUPPORTED_OPTIONS= nmh-backup-hash oauth sasl tls
-
-.include "../../mk/bsd.options.mk"
-
-###
-### Prepend a "#" instead of a "," to the name of a message that is
-### "removed" by rmm.
-###
-.if !empty(PKG_OPTIONS:Mnmh-backup-hash)
-CONFIGURE_ARGS+= --with-hash-backup
-.else
-CONFIGURE_ARGS+= --without-hash-backup
-.endif
-
-.if !empty(PKG_OPTIONS:Moauth)
-CONFIGURE_ARGS+= --with-oauth
-.include "../../www/curl/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --without-oauth
-.endif
-
-.if !empty(PKG_OPTIONS:Msasl)
-CONFIGURE_ARGS+= --with-cyrus-sasl
-.include "../../security/cyrus-sasl/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --without-cyrus-sasl
-.endif
-
-.if !empty(PKG_OPTIONS:Mtls)
-CONFIGURE_ARGS+= --with-tls
-.include "../../security/openssl/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --with-tls
-.endif
diff --git a/nmh/patches/patch-ca b/nmh/patches/patch-ca
deleted file mode 100644
index 92e1d27ebe..0000000000
--- a/nmh/patches/patch-ca
+++ /dev/null
@@ -1,88 +0,0 @@
-$NetBSD: patch-ca,v 1.8 2014/09/06 16:07:43 schnoebe Exp $
-
-- Introduce $egdir and install all configuration files in it, in order to
- properly use CONF_FILES to manage configuration files for pkgsrc.
-- Adjust TEST_ENVIRONMENT in order to use $egdir instead of $nmhetcdir
- and adjust $nmhetcdirinst to fix the `mhparam etcdir' test.
-
---- Makefile.in.orig 2017-08-03 02:22:59.000000000 +0000
-+++ Makefile.in
-@@ -864,6 +864,7 @@ smtpserver = @smtpserver@
- srcdir = @srcdir@
- supported_locks = @supported_locks@
- sysconfdir = @sysconfdir@
-+egdir = @prefix@/share/examples/nmh
- target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
-@@ -881,8 +882,8 @@ TESTS_ENVIRONMENT = MH_OBJ_DIR="@abs_bui
- CURL_USER_AGENT='@CURL_USER_AGENT@' \
- MH_TEST_DIR=`cd "@abs_builddir@" && pwd -P`/test/testdir \
- nmhlibexecdir="$(nmhlibexecdir)" bindir="$(bindir)" \
-- mandir="$(mandir)" nmhetcdir="$(nmhetcdir)" \
-- nmhetcdirinst="@nmhetcdirinst@$(nmhetcdir)" \
-+ mandir="$(mandir)" nmhetcdir="$(egdir)" \
-+ nmhetcdirinst="$(nmhetcdir)" \
- supported_locks="$(supported_locks)" \
- default_locking="${default_locking}" \
- MULTIBYTE_ENABLED=$(MULTIBYTE_ENABLED) \
-@@ -4625,46 +4626,46 @@ uninstall-dist_docs_contribDATA:
- dir='$(DESTDIR)$(docs_contribdir)'; $(am__uninstall_files_from_dir)
- install-dist_nmhetcDATA: $(dist_nmhetc_DATA)
- @$(NORMAL_INSTALL)
-- @list='$(dist_nmhetc_DATA)'; test -n "$(nmhetcdir)" || list=; \
-+ @list='$(dist_nmhetc_DATA)'; test -n "$(egdir)" || list=; \
- if test -n "$$list"; then \
-- echo " $(MKDIR_P) '$(DESTDIR)$(nmhetcdir)'"; \
-- $(MKDIR_P) "$(DESTDIR)$(nmhetcdir)" || exit 1; \
-+ echo " $(MKDIR_P) '$(DESTDIR)$(egdir)'"; \
-+ $(MKDIR_P) "$(DESTDIR)$(egdir)" || exit 1; \
- fi; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
-- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(nmhetcdir)'"; \
-- $(INSTALL_DATA) $$files "$(DESTDIR)$(nmhetcdir)" || exit $$?; \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(egdir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(egdir)" || exit $$?; \
- done
-
- uninstall-dist_nmhetcDATA:
- @$(NORMAL_UNINSTALL)
-- @list='$(dist_nmhetc_DATA)'; test -n "$(nmhetcdir)" || list=; \
-+ @list='$(dist_nmhetc_DATA)'; test -n "$(egdir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(nmhetcdir)'; $(am__uninstall_files_from_dir)
- install-nmhetcDATA: $(nmhetc_DATA)
- @$(NORMAL_INSTALL)
-- @list='$(nmhetc_DATA)'; test -n "$(nmhetcdir)" || list=; \
-+ @list='$(nmhetc_DATA)'; test -n "$(egdir)" || list=; \
- if test -n "$$list"; then \
-- echo " $(MKDIR_P) '$(DESTDIR)$(nmhetcdir)'"; \
-- $(MKDIR_P) "$(DESTDIR)$(nmhetcdir)" || exit 1; \
-+ echo " $(MKDIR_P) '$(DESTDIR)$(egdir)'"; \
-+ $(MKDIR_P) "$(DESTDIR)$(egdir)" || exit 1; \
- fi; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
-- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(nmhetcdir)'"; \
-- $(INSTALL_DATA) $$files "$(DESTDIR)$(nmhetcdir)" || exit $$?; \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(egdir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(egdir)" || exit $$?; \
- done
-
- uninstall-nmhetcDATA:
- @$(NORMAL_UNINSTALL)
-- @list='$(nmhetc_DATA)'; test -n "$(nmhetcdir)" || list=; \
-+ @list='$(nmhetc_DATA)'; test -n "$(egdir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-- dir='$(DESTDIR)$(nmhetcdir)'; $(am__uninstall_files_from_dir)
-+ dir='$(DESTDIR)$(egdir)'; $(am__uninstall_files_from_dir)
-
- ID: $(am__tagged_files)
- $(am__define_uniq_tagged_files); mkid -fID $$unique
diff --git a/nmh/patches/patch-cd b/nmh/patches/patch-cd
deleted file mode 100644
index 2847b8be2f..0000000000
--- a/nmh/patches/patch-cd
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-cd,v 1.7 2014/09/06 16:07:43 schnoebe Exp $
-
-make sure a time_t fits in
-
---- sbr/fmt_scan.c.orig 2017-05-17 01:03:54.000000000 +0000
-+++ sbr/fmt_scan.c
-@@ -365,7 +365,7 @@ fmt_scan (struct format *format, charstr
- char *savestr, *str;
- char buffer[NMH_BUFSIZ], buffer2[NMH_BUFSIZ];
- int i, c, rjust;
-- int value;
-+ long long value;
- time_t t;
- size_t max;
- struct format *fmt;
Home |
Main Index |
Thread Index |
Old Index