Update to mailutils-3.2

diff --git a/mailutils/DESCR b/mailutils/DESCR
index 5cad53fc3e729e4144329e684f407c6124d9e4a7..78de1057dc610ef0a4bb5052148157cd583232e0 100644 (file)
--- a/mailutils/DESCR
+++ b/mailutils/DESCR
@@ -1,8 +1,4 @@
-GNU Mailutils is a rich and powerful protocol-independent mail
-framework.  It contains a series of useful mail libraries, clients,
-and servers.  These are the primary mail utilities for the GNU system.
-The central library is capable of handling electronic mail in various
-mailbox formats and protocols, both local and remote.  Specifically,
-this project contains a POP3 server, an IMAP4 server, and a Sieve mail
-filter. It also provides a POSIX `mailx' client, and a collection of
-other handy tools.
+GNU Mailutils is a set of libraries and utilities for handling
+electronic mail. It addresses a wide audience and can be of interest
+to application developers, casual users and system administrators
+alike.

diff --git a/mailutils/Makefile b/mailutils/Makefile
index 7500a7e4818b3eaa24c73846f5254fa9ce5ce9b7..ddc31f9f10df24204dbe2fa2bf121acd81d35be8 100644 (file)
--- a/mailutils/Makefile
+++ b/mailutils/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2014/08/08 12:20:06 makoto Exp $
-DISTNAME=      mailutils-2.2
+# $NetBSD: Makefile,v 1.3 2017/08/14 09:00:06 ecbrown Exp $
+
+DISTNAME=      mailutils-3.2
 CATEGORIES=    mail
 MASTER_SITES=  ftp://ftp.gnu.org/gnu/mailutils/
-#MASTER_SITES= http://ftp.gnu.org/gnu/mailutils/
-LICENSE=       gnu-gpl-v3
 
 MAINTAINER=    pkgsrc-users@NetBSD.org
-HOMEPAGE=      http://mailutils.org/
-COMMENT=       Command line mail utils (for OS missing ucbmail)
+HOMEPAGE=      https://mailutils.org/
+COMMENT=       General-Purpose Mail Package
+LICENSE=       gnu-gpl-v3
 
 USE_TOOLS+=    gmake
 USE_LIBTOOL=   yes
@@ -15,6 +15,14 @@ USE_LANGUAGES=       c c++
 
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --infodir=${PREFIX}/info
-INFO_FILES=    yes
+CONFIGURE_ARGS+=        --disable-cxx
+CONFIGURE_ARGS+=        --disable-python
+CONFIGURE_ARGS+=       --without-ldap
+INFO_FILES=            yes
+
+MAKE_JOBS_SAFE=                no
 
+_INCOMPAT_READLINE=Darwin-*-* Interix-*-*
+.include "../../devel/readline/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

diff --git a/mailutils/PLIST b/mailutils/PLIST
index 860ba882f337ba23ce642e513cc8304a893cb3c5..4e530309b8790f7900fb1f186b7556ea6a5f9510 100644 (file)
--- a/mailutils/PLIST
+++ b/mailutils/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2014/08/05 05:37:59 makoto Exp $
+@comment $NetBSD$
 bin/dotlock
 bin/frm
 bin/from
 bin/mail
+bin/mailutils
 bin/mailutils-config
 bin/messages
 bin/mimeview
@@ -22,16 +23,21 @@ bin/mu-mh/mhl
 bin/mu-mh/mhn
 bin/mu-mh/mhparam
 bin/mu-mh/mhpath
+bin/mu-mh/mhseq
+bin/mu-mh/msgchk
 bin/mu-mh/pick
+bin/mu-mh/prompter
 bin/mu-mh/refile
 bin/mu-mh/repl
 bin/mu-mh/rmf
 bin/mu-mh/rmm
 bin/mu-mh/scan
 bin/mu-mh/send
+bin/mu-mh/show
 bin/mu-mh/sortm
 bin/mu-mh/whatnow
 bin/mu-mh/whom
+bin/popauth
 bin/readmsg
 bin/sieve
 include/mailutils/acl.h
@@ -44,32 +50,12 @@ include/mailutils/auth.h
 include/mailutils/body.h
 include/mailutils/cctype.h
 include/mailutils/cfg.h
-include/mailutils/cpp/address.h
-include/mailutils/cpp/attribute.h
-include/mailutils/cpp/body.h
-include/mailutils/cpp/debug.h
-include/mailutils/cpp/envelope.h
-include/mailutils/cpp/error.h
-include/mailutils/cpp/filter.h
-include/mailutils/cpp/folder.h
-include/mailutils/cpp/header.h
-include/mailutils/cpp/iterator.h
-include/mailutils/cpp/list.h
-include/mailutils/cpp/mailbox.h
-include/mailutils/cpp/mailcap.h
-include/mailutils/cpp/mailer.h
-include/mailutils/cpp/mailutils.h
-include/mailutils/cpp/message.h
-include/mailutils/cpp/mime.h
-include/mailutils/cpp/mutil.h
-include/mailutils/cpp/pop3.h
-include/mailutils/cpp/registrar.h
-include/mailutils/cpp/secret.h
-include/mailutils/cpp/sieve.h
-include/mailutils/cpp/stream.h
-include/mailutils/cpp/url.h
+include/mailutils/cidr.h
+include/mailutils/cli.h
 include/mailutils/cstr.h
 include/mailutils/daemon.h
+include/mailutils/datetime.h
+include/mailutils/dbm.h
 include/mailutils/debug.h
 include/mailutils/diag.h
 include/mailutils/envelope.h
@@ -77,35 +63,40 @@ include/mailutils/errno.h
 include/mailutils/error.h
 include/mailutils/filter.h
 include/mailutils/folder.h
-include/mailutils/gocs.h
+include/mailutils/glob.h
 include/mailutils/gsasl.h
 include/mailutils/guile.h
 include/mailutils/header.h
+include/mailutils/imap.h
+include/mailutils/imapio.h
+include/mailutils/imaputil.h
 include/mailutils/io.h
 include/mailutils/iterator.h
 include/mailutils/kwd.h
 include/mailutils/ldap.h
-include/mailutils/libargp.h
-include/mailutils/libcfg.h
 include/mailutils/list.h
 include/mailutils/locker.h
+include/mailutils/log.h
 include/mailutils/mailbox.h
 include/mailutils/mailcap.h
 include/mailutils/mailer.h
 include/mailutils/mailutils.h
 include/mailutils/md5.h
 include/mailutils/message.h
+include/mailutils/mh.h
 include/mailutils/mime.h
 include/mailutils/monitor.h
+include/mailutils/msgset.h
 include/mailutils/mu_auth.h
-include/mailutils/mutil.h
 include/mailutils/nls.h
 include/mailutils/nntp.h
 include/mailutils/observer.h
 include/mailutils/opool.h
+include/mailutils/opt.h
 include/mailutils/pam.h
 include/mailutils/parse822.h
 include/mailutils/pop3.h
+include/mailutils/prog.h
 include/mailutils/progmailer.h
 include/mailutils/property.h
 include/mailutils/python.h
@@ -116,33 +107,76 @@ include/mailutils/secret.h
 include/mailutils/server.h
 include/mailutils/sha1.h
 include/mailutils/sieve.h
+include/mailutils/smtp.h
+include/mailutils/sockaddr.h
 include/mailutils/sql.h
+include/mailutils/stdstream.h
 include/mailutils/stream.h
+include/mailutils/sys/amd.h
+include/mailutils/sys/attribute.h
+include/mailutils/sys/auth.h
+include/mailutils/sys/body.h
+include/mailutils/sys/dbm.h
+include/mailutils/sys/debcat.h
+include/mailutils/sys/envelope.h
+include/mailutils/sys/file_stream.h
+include/mailutils/sys/filter.h
+include/mailutils/sys/folder.h
+include/mailutils/sys/gsasl-stream.h
+include/mailutils/sys/header.h
+include/mailutils/sys/header_stream.h
+include/mailutils/sys/imap.h
+include/mailutils/sys/imapio.h
+include/mailutils/sys/iostream.h
+include/mailutils/sys/iterator.h
+include/mailutils/sys/list.h
+include/mailutils/sys/logstream.h
+include/mailutils/sys/mailbox.h
+include/mailutils/sys/mailer.h
+include/mailutils/sys/mapfile_stream.h
+include/mailutils/sys/memory_stream.h
+include/mailutils/sys/message.h
+include/mailutils/sys/message_stream.h
+include/mailutils/sys/mime.h
+include/mailutils/sys/monitor.h
+include/mailutils/sys/msgset.h
 include/mailutils/sys/nntp.h
+include/mailutils/sys/nullstream.h
+include/mailutils/sys/observer.h
 include/mailutils/sys/pop3.h
+include/mailutils/sys/prog_stream.h
+include/mailutils/sys/property.h
+include/mailutils/sys/rdcache_stream.h
+include/mailutils/sys/registrar.h
+include/mailutils/sys/smtp.h
+include/mailutils/sys/stream.h
+include/mailutils/sys/streamref.h
+include/mailutils/sys/streamtrans.h
+include/mailutils/sys/syslogstream.h
+include/mailutils/sys/temp_file_stream.h
+include/mailutils/sys/tls-stream.h
+include/mailutils/sys/url.h
+include/mailutils/sys/xscript-stream.h
 include/mailutils/syslog.h
 include/mailutils/tls.h
 include/mailutils/types.h
 include/mailutils/url.h
-include/mailutils/vartab.h
+include/mailutils/util.h
 include/mailutils/version.h
+include/mailutils/wordsplit.h
 info/mailutils.info
-info/mailutils.info-1
-info/mailutils.info-2
-lib/charset.alias
 lib/libmailutils.la
-lib/libmu_argp.a
 lib/libmu_auth.la
-lib/libmu_cfg.la
-lib/libmu_cpp.la
+lib/libmu_dbm.la
 lib/libmu_imap.la
 lib/libmu_maildir.la
 lib/libmu_mailer.la
 lib/libmu_mbox.la
 lib/libmu_mh.la
-lib/libmu_nntp.la
 lib/libmu_pop.la
 lib/libmu_sieve.la
+lib/libmuaux.la
+lib/mailutils/editheader.la
 lib/mailutils/list.la
 lib/mailutils/moderator.la
 lib/mailutils/numaddr.la
@@ -161,9 +195,31 @@ sbin/pop3d
 share/aclocal/mailutils.m4
 share/emacs/site-lisp/mailutils-mh.el
 share/emacs/site-lisp/mailutils-mh.elc
+share/locale/ca/LC_MESSAGES/mailutils.mo
+share/locale/da/LC_MESSAGES/mailutils.mo
+share/locale/de/LC_MESSAGES/mailutils.mo
+share/locale/es/LC_MESSAGES/mailutils.mo
+share/locale/fi/LC_MESSAGES/mailutils.mo
+share/locale/fr/LC_MESSAGES/mailutils.mo
+share/locale/id/LC_MESSAGES/mailutils.mo
+share/locale/pl/LC_MESSAGES/mailutils.mo
+share/locale/ro/LC_MESSAGES/mailutils.mo
+share/locale/ru/LC_MESSAGES/mailutils.mo
+share/locale/sv/LC_MESSAGES/mailutils.mo
+share/locale/uk/LC_MESSAGES/mailutils.mo
+share/locale/vi/LC_MESSAGES/mailutils.mo
 share/mailutils/mh/components
+share/mailutils/mh/forwcomps
 share/mailutils/mh/mailutils-mh.el
 share/mailutils/mh/mhl.format
+share/mailutils/mh/mhl.forward
+share/mailutils/mh/mhl.headers
+share/mailutils/mh/mhl.repl
+share/mailutils/mh/mhl.usenet
 share/mailutils/mh/replcomps
 share/mailutils/mh/replgroupcomps
-@pkgdir share/mailutils/${PKGVERSION}/modules
+share/mailutils/mh/scan.default
+share/mailutils/mh/scan.mailx
+share/mailutils/mh/scan.size
+share/mailutils/mh/scan.time
+share/mailutils/mh/scan.timely

diff --git a/mailutils/TODO b/mailutils/TODO
index 93951da8805edf9a7570481f37fedc66cdfcb902..af678e7687836a0308c327e33b9a086e1f00cafe 100644 (file)
--- a/mailutils/TODO
+++ b/mailutils/TODO
@@ -1,27 +1,3 @@
-- Ubuntu 13.04
-  (1) In file included from argp.h:22:0,
-                   from argp-eexst.c:25:
-     ./stdio.h:409:1: error: 'gets' undeclared here (not in a function)
-    408 #undef gets
-    409  _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-  (2)
-    ....
-    libtool: install: warning: relinking `list.la'
-    libtool: install: (cd
-        /usr/pkgsrc/wip/mailutils/work/mailutils-2.2/libmu_sieve/extensions;
-        /usr/bin/ksh /usr/pkg/bin/libtool --silent --tag CC
-        --mode=relink gcc -O2 -Wno-error -module -avoid-version
-        -no-undefined -rpath /usr/pkg/lib/mailutils -Wl,-R/usr/pkg/lib
-        -o list.la -rpath /usr/pkg/lib/mailutils list.lo -L../.libs
-        ../libmu_sieve.la
-        -L/usr/pkgsrc/wip/mailutils/work/.buildlink/lib
-        -inst-prefix-dir /usr/pkgsrc/wip/mailutils/work/.destdir)
-    /usr/pkg/bin/libtool[6004]: cd:
-       /usr/pkgsrc/wip/mailutils/work/mailutils-2.2/libmu_sieve/libs:
-       [No such file or directory]
-    libtool: relink: cannot determine absolute directory name of `../.libs'
-    libtool: install: error: relink `list.la' with the above command before installing it
- 
 - PLIST:10: The bin/ directory should not have subdirectories.
   .. but this should be intention of original authors, I believe.
 - License: gnu-gpl-v3 and gnu-lgpl-v3

diff --git a/mailutils/distinfo b/mailutils/distinfo
index 5ddd475e6be32e177e8f1db435ab166665767bcf..cd0dad8b7d313dfbab8f31b33a658ec607183b8b 100644 (file)
--- a/mailutils/distinfo
+++ b/mailutils/distinfo
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.2 2014/08/08 12:20:06 makoto Exp $
 
-SHA1 (mailutils-2.2.tar.gz) = 166a47c5eef6192542b568e031719c3e8d01d1f5
-RMD160 (mailutils-2.2.tar.gz) = cdbd626d520435dc8c7d4a27d79b3ea70a1290f7
-Size (mailutils-2.2.tar.gz) = 4497847 bytes
-SHA1 (patch-lib_stdio_in_h) = 256d3e0af178f2407db79fd18c0d17d5ba86a778
+SHA1 (mailutils-3.2.tar.gz) = 852f99e63c0827502096de7badf50bef7a8d102d
+RMD160 (mailutils-3.2.tar.gz) = bbd5cdf351b9bc131de89095c98770b68e52b93c
+SHA512 (mailutils-3.2.tar.gz) = 5528799ba1bf7b8eaf3c0e2fe436aeb0be03ccb85788eff7ab6f860da9a03d00f86a4ebcf6839c0a164c6c6d1a0cfe38ec8c848db45376d958325dadba13549e
+Size (mailutils-3.2.tar.gz) = 6095165 bytes

diff --git a/mailutils/patches/patch-lib_stdio_in_h b/mailutils/patches/patch-lib_stdio_in_h
deleted file mode 100644 (file)
index 6eed0b2..0000000
--- a/mailutils/patches/patch-lib_stdio_in_h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-lib_stdio_in_h,v 1.1 2014/08/08 12:20:06 makoto Exp $
-
-(Ubuntsu 13.04, 14.04)
-In file included from localcharset.c:30:0:
-./stdio.h:410:1: error: 'gets' undeclared here (not in a function)
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- ^
-
---- lib/stdio.in.h.orig        2010-04-06 18:34:33.000000000 +0900
-+++ lib/stdio.in.h     2014-08-08 21:12:21.488160526 +0900
-@@ -139,7 +139,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
-+#ifndef __linux
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@