Update to 2.6.1, from diro in PR 47209.

Relevant ChangeLog entries since 2.5:

	* src/main.c, src/minicom.c: iconv: Handle the case that iconv
	  did not convert anything. Reported by Mike Crowe, Debian #659351.
	* src/ipc.c: Formatting cleanup.
	* src/main.c: ETIME -> ETIMEDOUT as ETIME is not available on BSDs
	* src/main.c: Fix invalid memory used, reported by Larry Baker
	* src/config.c, src/rwconf.c: Do not set modem init and reset string
	  anymore, define them empty. Instead, when editing those offer
	  them as a default.
	* src/minicom.h, src/main.c, src/dial.c: only update statusline
	  if there's a change (e.g. for updates times)
	* src/updown.c: Flush before forking helper program,
	  patch by Domen Puncer, thanks!
	* src/minicom.c, src/minicom.h, src/vt100.c: Add timestamps with
	  milliseconds, based on patch by Rapha�l Ass�nat, thanks!
	* src/dial.c, src/minicom.c, src/main.c: Cleanups. Print
	  basename of current device to statusline if online time is disabled.
	* configure.in, src/Makefile.am, src/main.c, src/minicom.c,
	  src/minicom.h, src/updown.c: Add lockdev support,
	  by Ludwig Nussel <ludwig.nussel@suse.de>
	* src/dial.c: add a dialdir version 6 which does not save the
	  pointer on disk and should now work on 32 and 64 bit
	  systems equally.
	* configure.in: Use AM_ICONV_LINK...
	* src/script.c: Fix a buffer overflow problem. Thanks Frederic Germain.
	* src/minicom.c: Do not use iconv-functions if iconv is not available.
	* src/config.c, src/main.c, src/vt100.c, src/vt100.h: Add transmit
	  delay for every character, based on patch by Nicolas PILLON.
	* src/config.c: Do not extend tilde to home directory for
	  non-path arguments. Debian bug #621741
	* configure.in, src/Makefile.am: Add workaround and then use
	  libiconv for linking, fixes build issue on Mac OS X.
	* src/main.c: Increase serial port open timeout, by
	  Lubomir Rintel
	* src/main.c: Set sensible errno if port open times out,
	  by Lubomir Rintel
	* src/help.c: Help fix for timestamp toggle by Mark Einon
	* src/minicom.c: Code consolidation.
	* src/minicom.c, src/minicom.h, src/vt100.c, man/minicom.1: Make
	  line timestamps three value: every line, every second, and off.
	* man/minicom.1: Wording fix.
	* src/vt100.c: Cleanups: Delete everything that was in OLD blocks.
	  Do not explicitly set global variables to 0.
	* src/vt100.c, man/minicom.1: Change timestamp style, prepend every
	  line. Add in manpage.
	* src/dial.c src/help.c src/ipc.c src/minicom.c src/minicom.h
	  src/vt100.c src/vt100.h: Addition by Mark Einon
	  <mark.einon@gmail.com> to add current date/time to each line.
	* src/file.c: Only enter directory if we have read permissions to
	  get directory listings, by Jan Görig.
	* src/file.c, src/getsdir.c: Cleanup and simplify.
	* man/runscript.1, man/minicom.1: Fixes by John Bradshaw
	* src/main.c: Avoid redraw of status line in Offline mode when
	  nothing changed.
	* src/minicom.c: Do not lose line wrap setting over terminal resizes.
	* src/main.c: Simplify status line update, also makes status
	  messages display the amount of time they are actually supposed
	  to display.

11 files changed, 84 insertions, 65 deletions

diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index beb0da3e789..0fd602a2ddb 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.61 2012/10/03 11:24:42 asau Exp $
+# $NetBSD: Makefile,v 1.62 2012/12/12 12:35:21 wiz Exp $
 
-DISTNAME=	minicom-2.5
-PKGREVISION=	1
+DISTNAME=	minicom-2.6.1
 CATEGORIES=	comms
-MASTER_SITES=	http://alioth.debian.org/frs/download.php/3487/
+MASTER_SITES=	http://alioth.debian.org/frs/download.php/3700/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://alioth.debian.org/projects/minicom/
@@ -41,6 +40,8 @@ SUBST_STAGE.minicom=	post-patch
 SUBST_FILES.minicom=	src/rwconf.c
 SUBST_VARS.minicom=	PREFIX GKERMIT_PREFIX LRZSZ_PREFIX
 
+.include "options.mk"
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/termcap.buildlink3.mk"
diff --git a/comms/minicom/PLIST b/comms/minicom/PLIST
index 8009daad8fa..8608a93e191 100644
--- a/comms/minicom/PLIST
+++ b/comms/minicom/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2011/08/01 09:30:33 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2012/12/12 12:35:21 wiz Exp $
 bin/ascii-xfr
 bin/minicom
 bin/runscript
@@ -7,21 +7,21 @@ man/man1/ascii-xfr.1
 man/man1/minicom.1
 man/man1/runscript.1
 man/man1/xminicom.1
-share/locale/cs/LC_MESSAGES/minicom.mo
-share/locale/da/LC_MESSAGES/minicom.mo
-share/locale/de/LC_MESSAGES/minicom.mo
-share/locale/es/LC_MESSAGES/minicom.mo
-share/locale/fi/LC_MESSAGES/minicom.mo
-share/locale/fr/LC_MESSAGES/minicom.mo
-share/locale/hu/LC_MESSAGES/minicom.mo
-share/locale/id/LC_MESSAGES/minicom.mo
-share/locale/ja/LC_MESSAGES/minicom.mo
-share/locale/nb/LC_MESSAGES/minicom.mo
-share/locale/pl/LC_MESSAGES/minicom.mo
-share/locale/pt_BR/LC_MESSAGES/minicom.mo
-share/locale/ro/LC_MESSAGES/minicom.mo
-share/locale/ru/LC_MESSAGES/minicom.mo
-share/locale/rw/LC_MESSAGES/minicom.mo
-share/locale/sv/LC_MESSAGES/minicom.mo
-share/locale/vi/LC_MESSAGES/minicom.mo
-share/locale/zh_TW/LC_MESSAGES/minicom.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/minicom.mo
+${PLIST.nls}share/locale/da/LC_MESSAGES/minicom.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/minicom.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/minicom.mo
+${PLIST.nls}share/locale/fi/LC_MESSAGES/minicom.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/minicom.mo
+${PLIST.nls}share/locale/hu/LC_MESSAGES/minicom.mo
+${PLIST.nls}share/locale/id/LC_MESSAGES/minicom.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/minicom.mo
+${PLIST.nls}share/locale/nb/LC_MESSAGES/minicom.mo
+${PLIST.nls}share/locale/pl/LC_MESSAGES/minicom.mo
+${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/minicom.mo
+${PLIST.nls}share/locale/ro/LC_MESSAGES/minicom.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/minicom.mo
+${PLIST.nls}share/locale/rw/LC_MESSAGES/minicom.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/minicom.mo
+${PLIST.nls}share/locale/vi/LC_MESSAGES/minicom.mo
+${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/minicom.mo
diff --git a/comms/minicom/distinfo b/comms/minicom/distinfo
index 52aa6f6e06d..8a78d6806f5 100644
--- a/comms/minicom/distinfo
+++ b/comms/minicom/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.12 2011/12/05 08:10:18 adam Exp $
+$NetBSD: distinfo,v 1.13 2012/12/12 12:35:21 wiz Exp $
 
-SHA1 (minicom-2.5.tar.gz) = 442250314de63189b619f8744c0669445e2cdd1d
-RMD160 (minicom-2.5.tar.gz) = 4131b9ef37d25cf8f77a70fc4b4de32e7896cc23
-Size (minicom-2.5.tar.gz) = 822499 bytes
-SHA1 (patch-aa) = 1ce591eb1f9969a8dd72194d10f69a1df77c35a7
-SHA1 (patch-ab) = db913d60191fd1b0830746019c6cc9c125069cfb
-SHA1 (patch-ac) = 6af60d8edb50f4cd10bc4b63a792cec2075ed6d5
-SHA1 (patch-ad) = e57999876f690689d858aa07f5c122ea79bfd2f1
-SHA1 (patch-ae) = 1d3267fc666d857bbab05a542de6d3aa1ba53e14
-SHA1 (patch-ag) = cf6c551736feb77f7f714cb4ba8b9a787eac937d
-SHA1 (patch-ah) = 499f2372a27ffef2b51aa5d9ac21545d1fe5c277
+SHA1 (minicom-2.6.1.tar.gz) = ce6b5f3dab6b4179736152e38a806029f8ad222a
+RMD160 (minicom-2.6.1.tar.gz) = d9c7bf6d661427ff1a4007a917574e4ecd872c50
+Size (minicom-2.6.1.tar.gz) = 830485 bytes
+SHA1 (patch-ab) = e87dbe616958b2b1a01a9a7dfa8cb8f8c1a6978f
+SHA1 (patch-ac) = b2ffa106989ea562b8ea85bfd15e516713a37f3f
+SHA1 (patch-ad) = a3e50ae6dcacb6ae6a177e5b6e4d3d959d960eca
+SHA1 (patch-ae) = ea2fb58212de7caaaed4c0817290ca3612212b6c
+SHA1 (patch-ag) = 5f635b67e2e48d13c9df7f3ed4fdca83a1c7f7ef
+SHA1 (patch-ah) = ae6048f6a8e81134a459aaf21527e944c68ae07f
diff --git a/comms/minicom/options.mk b/comms/minicom/options.mk
new file mode 100644
index 00000000000..7805c6c365e
--- /dev/null
+++ b/comms/minicom/options.mk
@@ -0,0 +1,16 @@
+# $NetBSD: options.mk,v 1.1 2012/12/12 12:35:21 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.minicom
+PKG_SUPPORTED_OPTIONS=	nls
+PKG_SUGGESTED_OPTIONS+=	nls
+
+PLIST_VARS+=		nls
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mnls)
+CONFIGURE_ARGS+=	--enable-nls
+PLIST.nls=		yes
+.else
+CONFIGURE_ARGS+=	--disable-nls
+.endif
diff --git a/comms/minicom/patches/patch-aa b/comms/minicom/patches/patch-aa
deleted file mode 100644
index 76a1627ece1..00000000000
--- a/comms/minicom/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.10 2011/08/01 09:30:33 adam Exp $
-
---- src/Makefile.in.orig	2011-01-29 11:45:05.000000000 +0000
-+++ src/Makefile.in
-@@ -247,7 +247,7 @@ confdir = @MINICOM_CONFDIR@
- AM_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/lib -DCONFDIR=\"$(confdir)\" \
-               -DLOCALEDIR=\"$(datadir)/locale\"
- 
--minicom_LDADD = @LIBINTL@ $(MINICOM_LIBPORT)
-+minicom_LDADD = @LIBINTL@ $(MINICOM_LIBPORT) $(LIBICONV)
- minicom_keyserv_LDADD = @LIBINTL@ $(MINICOM_LIBPORT)
- runscript_LDADD = @LIBINTL@ $(MINICOM_LIBPORT)
- EXTRA_DIST = functions.c
diff --git a/comms/minicom/patches/patch-ab b/comms/minicom/patches/patch-ab
index ccdbbf82d9b..57e648b8c26 100644
--- a/comms/minicom/patches/patch-ab
+++ b/comms/minicom/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2011/08/01 09:30:33 adam Exp $
+$NetBSD: patch-ab,v 1.6 2012/12/12 12:35:21 wiz Exp $
+
+Fix installed man pages.
 
 --- man/Makefile.am.orig	2009-12-12 15:47:47.000000000 +0000
 +++ man/Makefile.am
diff --git a/comms/minicom/patches/patch-ac b/comms/minicom/patches/patch-ac
index 0a7c408ac32..6988890e707 100644
--- a/comms/minicom/patches/patch-ac
+++ b/comms/minicom/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.6 2011/08/01 09:30:33 adam Exp $
+$NetBSD: patch-ac,v 1.7 2012/12/12 12:35:21 wiz Exp $
 
---- src/updown.c.orig	2010-05-30 20:34:00.000000000 +0000
+--- src/updown.c.orig	2011-09-07 21:04:32.000000000 +0000
 +++ src/updown.c
-@@ -294,7 +294,7 @@ void updown(int what, int nr)
+@@ -296,7 +296,7 @@ void updown(int what, int nr)
      do_log("%s", cmdline);   /* jl 22.06.97 */
  
    if (P_PFULL(g) == 'N') {
diff --git a/comms/minicom/patches/patch-ad b/comms/minicom/patches/patch-ad
index 2a586f8bcf5..5684c4c99d2 100644
--- a/comms/minicom/patches/patch-ad
+++ b/comms/minicom/patches/patch-ad
@@ -1,6 +1,8 @@
-$NetBSD: patch-ad,v 1.8 2011/08/01 09:30:33 adam Exp $
+$NetBSD: patch-ad,v 1.9 2012/12/12 12:35:21 wiz Exp $
 
---- src/rwconf.c.orig	2011-01-16 10:01:18.000000000 +0000
+Removed hardcoded LRZSZ_PREFIX and PREFIX.
+
+--- src/rwconf.c.orig	2011-12-27 22:21:05.000000000 +0000
 +++ src/rwconf.c
 @@ -76,27 +76,15 @@ struct pars mpars[] = {
    { "",			0,   "pname10" },
diff --git a/comms/minicom/patches/patch-ae b/comms/minicom/patches/patch-ae
index de230e267bf..280ec10b56f 100644
--- a/comms/minicom/patches/patch-ae
+++ b/comms/minicom/patches/patch-ae
@@ -1,8 +1,14 @@
-$NetBSD: patch-ae,v 1.6 2011/08/01 09:30:33 adam Exp $
+$NetBSD: patch-ae,v 1.7 2012/12/12 12:35:21 wiz Exp $
 
---- src/windiv.c.orig	2003-04-22 01:56:46.000000000 +0200
-+++ src/windiv.c	2005-06-29 07:03:12.000000000 +0200
-@@ -22,2 +22,3 @@
+Needs sys/types.h.
+
+--- src/windiv.c.orig	2009-12-12 15:47:47.000000000 +0000
++++ src/windiv.c
+@@ -20,6 +20,7 @@
+ #include <config.h>
+ #endif
  
 +#include <sys/types.h>
  #include <dirent.h>
+ #include <sys/stat.h>
+ #include "port.h"
diff --git a/comms/minicom/patches/patch-ag b/comms/minicom/patches/patch-ag
index 9318e102f46..f44f80886b3 100644
--- a/comms/minicom/patches/patch-ag
+++ b/comms/minicom/patches/patch-ag
@@ -1,15 +1,17 @@
-$NetBSD: patch-ag,v 1.4 2011/08/01 09:30:33 adam Exp $
+$NetBSD: patch-ag,v 1.5 2012/12/12 12:35:21 wiz Exp $
 
---- src/getsdir.c.orig	2009-12-12 15:47:47.000000000 +0000
+Use NAME_MAX, if defined, instead of MAXNAMLEN.
+
+--- src/getsdir.c.orig	2011-02-14 10:07:00.000000000 +0000
 +++ src/getsdir.c
-@@ -185,7 +185,11 @@ int getsdir(const char *dirpath, const c
-           int l;
+@@ -232,7 +232,11 @@ int getsdir(const char *dirpath, const c
+             }
  
            /* copy the filename */
 +#ifdef NAME_MAX
-+          strncpy(datb_cur->data[datb_cur->cnt].fname, dp->d_name, NAME_MAX);
++          strncpy((*datptr)[cnt].fname, dp->d_name, NAME_MAX);
 +#else
-           strncpy(datb_cur->data[datb_cur->cnt].fname, dp->d_name, MAXNAMLEN);
+           strncpy((*datptr)[cnt].fname, dp->d_name, MAXNAMLEN);
 +#endif
  
            /* get information about the directory entry */
diff --git a/comms/minicom/patches/patch-ah b/comms/minicom/patches/patch-ah
index 079c82f81f9..5c8331e8d1b 100644
--- a/comms/minicom/patches/patch-ah
+++ b/comms/minicom/patches/patch-ah
@@ -1,8 +1,12 @@
-$NetBSD: patch-ah,v 1.3 2011/12/05 08:10:18 adam Exp $
+$NetBSD: patch-ah,v 1.4 2012/12/12 12:35:21 wiz Exp $
+
+Needs limits.h and NAME_MAX defined, if it's not already.
 
 --- src/getsdir.h.orig	2009-12-12 15:47:47.000000000 +0000
 +++ src/getsdir.h
-@@ -25,7 +25,12 @@
+@@ -23,9 +23,14 @@
+  */
+ 
  #include <dirent.h>
 +#include <limits.h>