Update minicom to 0.83.1

Notable changes include:
- An old signal handling bug has been fixed. It sometimes caused an
  eternal loop of "Killed by signal x" - "Resetting modem" - "Killed
  by signal y" when minicom was aborted unexpectedly, and then it could
  only be killed with kill -9 (SIGKILL).
- Now there is also a setting in the Bps/par/bits section of the Serial
  port setup menu to use two stop bits.
- Some patches for SVR4 lock file handling.
- Fixed some compilation errors when -D_HAVE_MACROS is not defined
  in the makefile.
- possible overflows fixed in inputting the manual dialing string and
  search string in the phone dir.
- user-configurable options to disable writing the logfile or select
  which things to write there
- the command line option -d now accepts multiple numbers or names as
  the parameter. Separate them with commas and use no spaces around it.
- a fix for the script timeout command that sometimes didn't work right.
- now you can move an entry up/down in the phone directory.
- flag %f added to the upload/download protocol program command lines to
  allow passing the port file descriptor to c-kermit
- support for DTE speed 230400 bps
- newline delay option added in the terminal settings
- multiline option added to untag all phonedir entries with the same name
  when one of them answers

6 files changed, 33 insertions, 61 deletions

diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index 1181262b47c..37440d986d4 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2000/01/05 22:58:13 tron Exp $
+# $NetBSD: Makefile,v 1.18 2000/06/12 18:40:54 rh Exp $
 # FreeBSD Id: Makefile,v 1.13 1998/01/03 10:58:40 obrien Exp
 #
 
 DISTNAME=	${PKGNAME}.src
-PKGNAME=	minicom-1.82.1
+PKGNAME=	minicom-1.83.1
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SUNSITE:=apps/serialcomm/dialout/} \
 		http://www.pp.clinet.fi/~walker/
diff --git a/comms/minicom/files/md5 b/comms/minicom/files/md5
index 93dc03bb90c..137bf1b8081 100644
--- a/comms/minicom/files/md5
+++ b/comms/minicom/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1999/04/14 21:13:24 tron Exp $
+$NetBSD: md5,v 1.4 2000/06/12 18:40:54 rh Exp $
 
-MD5 (minicom-1.82.1.src.tar.gz) = 67cddf3fc1857608edc2513be6fc58f2
+MD5 (minicom-1.83.1.src.tar.gz) = 54311e7ab398a87088eafbe5e7c09cad
diff --git a/comms/minicom/files/patch-sum b/comms/minicom/files/patch-sum
index 11b7fdbc11b..12c1f676e76 100644
--- a/comms/minicom/files/patch-sum
+++ b/comms/minicom/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.3 2000/01/05 22:58:13 tron Exp $
+$NetBSD: patch-sum,v 1.4 2000/06/12 18:40:54 rh Exp $
 
-MD5 (patch-aa) = 11b627a75d6e79ec381ba90d4c22765c
+MD5 (patch-aa) = 0e2c7c6d7fb39bed2bf1bb2131fcfedc
 MD5 (patch-ab) = 87204000b3bc4d37f96aa646e3318289
-MD5 (patch-ac) = c36b22c7abee7dfd843c80c18bb8df6c
+MD5 (patch-ac) = b5d7b5f3a5de6f6d503b7b525c0becdf
 MD5 (patch-ad) = c8bb4d267374b5b05f97900a881aa6e7
 MD5 (patch-ae) = a5b55537197f22ca404b1b26bbc3e064
 MD5 (patch-af) = f5f0850d0c4d03bf9a700712434330d9
diff --git a/comms/minicom/patches/patch-aa b/comms/minicom/patches/patch-aa
index 3b47861e536..8af099bcfe2 100644
--- a/comms/minicom/patches/patch-aa
+++ b/comms/minicom/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.6 1999/04/23 19:55:56 mycroft Exp $
+$NetBSD: patch-aa,v 1.7 2000/06/12 18:40:55 rh Exp $
 
---- Makefile.orig	Sat Jul 25 21:05:46 1998
-+++ Makefile	Wed Apr 14 22:34:08 1999
+--- Makefile.orig	Tue Apr 25 17:42:32 2000
++++ Makefile	Mon Jun 12 20:21:05 2000
 @@ -22,10 +22,10 @@
- #
+ # enochw@scn.org Oct 99: flags for UWIN 2.0 (Unix for Windows)
  
  # Where to install things for Linux sites (FSSTND)
 -BINDIR	= /usr/bin
@@ -22,10 +22,10 @@ $NetBSD: patch-aa,v 1.6 1999/04/23 19:55:56 mycroft Exp $
  # MANDIR = /usr/local/man/man1
  
 +# Where to install things for NetBSD sites.
-+BINDIR	= $(PREFIX)/bin
-+LIBDIR	= $(PREFIX)/etc/minicom
-+DOCDIR	= $(PREFIX)/share/doc/minicom
-+MANDIR	= $(PREFIX)/man/man1
++BINDIR	= ${PREFIX}/bin
++LIBDIR	= ${PREFIX}/etc/minicom
++DOCDIR	= ${PREFIX}/share/doc/minicom
++MANDIR	= ${PREFIX}/man/man1
 +
  # Where to install things for "normal" sites.
  # BINDIR	= /usr/local/bin
@@ -47,10 +47,11 @@ $NetBSD: patch-aa,v 1.6 1999/04/23 19:55:56 mycroft Exp $
  
  # Take these compilation flags for FreeBSD.
  #FLAGS	= -Wall -D_POSIX -D_BSD43 -D_SELECT -D_DCDFLOW
-@@ -153,6 +159,14 @@
+@@ -173,6 +179,14 @@
+ #LFLAGS	= -s
  #PROGS	= minicom runscript ascii-xfr keyserv
  #LIBS	=
- 
++
 +# Take these compilation flags for NetBSD.
 +FLAGS	= -Wall -D_POSIX -D_BSD43 -D_SELECT -D_DCDFLOW -I$(PREFIX)/include -DBINDIR=\"$(BINDIR)\"
 +PROGS	= minicom runscript ascii-xfr
@@ -58,38 +59,6 @@ $NetBSD: patch-aa,v 1.6 1999/04/23 19:55:56 mycroft Exp $
 +INTL	= -Wl,-R$(PREFIX)/lib -L$(PREFIX)/lib -lintl
 +LIBS	= $(INTL) -lcurses -ltermcap
 +CC	= cc
-+
- # Nothing should have to change beneath this line
- 
- SRCS	= minicom.c vt100.c config.c help.c updown.c \
-@@ -188,13 +202,13 @@
- 		$(CC) $(LFLAGS) -o minicom $(MOBJS) $(LIBS)
- 
- po: dummy
--		make -C po
-+		${MAKE} -C po
  
- keyserv:	$(KOBJS)
- 		$(CC) -o keyserv $(LFLAGS) $(KOBJS) $(LIBS)
- 
- runscript:	$(SOBJS)
--		$(CC) -o runscript $(LFLAGS) $(SOBJS)
-+		$(CC) -o runscript $(LFLAGS) $(SOBJS) $(INTL)
- 
- ascii-xfr:	ascii-xfr.o
- 		$(CC) -s -o ascii-xfr $(LFLAGS) ascii-xfr.o
-@@ -241,12 +255,12 @@
- dummy:
- 
- install:	$(PROGS)
--		make -C po install R=$(R)
-+		${MAKE} -C po install R=$(R)
- 		sh install.sh $(R)$(LIBDIR) $(R)$(BINDIR) $(R)$(MANDIR) $(R)$(DOCDIR)
- 
- clobber:
- 		rm -f *.o *~ minicom keyserv runscript ascii-xfr
--		make -C po clean
-+		${MAKE} -C po clean
+ # Nothing should have to change beneath this line
  
- clean:		
- 		rm -f *.o
diff --git a/comms/minicom/patches/patch-ac b/comms/minicom/patches/patch-ac
index 0ea75aeab6a..2ff9690f55f 100644
--- a/comms/minicom/patches/patch-ac
+++ b/comms/minicom/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.3 1999/04/14 21:13:24 tron Exp $
+$NetBSD: patch-ac,v 1.4 2000/06/12 18:40:55 rh Exp $
 
---- updown.c.orig	Thu Jul  9 14:49:47 1998
-+++ updown.c	Sun Dec 13 18:34:51 1998
-@@ -230,7 +230,7 @@
-   do_log(cmdline);   /* jl 22.06.97 */
+--- updown.c.orig	Thu Mar 16 10:44:26 2000
++++ updown.c	Mon Jun 12 20:24:37 2000
+@@ -238,7 +238,7 @@
+     do_log(cmdline);   /* jl 22.06.97 */
  
    if (P_PFULL(g) == 'N') {
 -    win = wopen(10, 7, 70, 13, BSINGLE, stdattr, mfcolor, mbcolor, 1, 0, 1);
diff --git a/comms/minicom/pkg/PLIST b/comms/minicom/pkg/PLIST
index 28c41657de8..b46a42c41fe 100644
--- a/comms/minicom/pkg/PLIST
+++ b/comms/minicom/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 1999/04/14 21:13:24 tron Exp $
+@comment $NetBSD: PLIST,v 1.5 2000/06/12 18:40:55 rh Exp $
 bin/ascii-xfr
 bin/minicom
 bin/runscript
@@ -10,6 +10,8 @@ man/man1/ascii-xfr.1
 share/doc/minicom/Announce-1.78
 share/doc/minicom/Announce-1.82
 share/doc/minicom/Announce-1.82.1
+share/doc/minicom/Announce-1.83
+share/doc/minicom/Announce-1.83.1
 share/doc/minicom/COMPATABILITY.lrzsz
 share/doc/minicom/ChangeLog
 share/doc/minicom/HistSearch
@@ -23,10 +25,8 @@ share/doc/minicom/TODO.lrzsz
 share/doc/minicom/Todo
 share/doc/minicom/Todo.175
 share/doc/minicom/Todo.Irix.dif
-share/doc/minicom/Todo.dial.c.dif
 share/doc/minicom/Todo.emacskey.dif
 share/doc/minicom/Todo.fsel
-share/doc/minicom/Todo.i18n
 share/doc/minicom/copyright.modemu
 share/doc/minicom/demos/htsalogin
 share/doc/minicom/demos/saralogin
@@ -35,6 +35,8 @@ share/doc/minicom/demos/unixlogin
 share/doc/minicom/developers
 share/doc/minicom/fselector.txt
 share/doc/minicom/japanese
+share/doc/minicom/minicom.FAQ
+share/doc/minicom/minicom.users
 share/doc/minicom/minirc.dfl
 share/doc/minicom/modemu.README
 share/doc/minicom/pl-translation.txt
@@ -44,12 +46,13 @@ share/doc/minicom/tables/mc.iso
 share/doc/minicom/tables/mc.noconv
 share/doc/minicom/tables/mc.pc8
 share/doc/minicom/tables/mc.sf7
+share/locale/fi_FI/LC_MESSAGES/minicom.mo
 share/locale/fr/LC_MESSAGES/minicom.mo
+share/locale/ja/LC_MESSAGES/minicom.mo
+share/locale/ja_JP.SJIS/LC_MESSAGES/minicom.mo
+share/locale/ko/LC_MESSAGES/minicom.mo
 share/locale/pl/LC_MESSAGES/minicom.mo
 share/locale/pt_BR/LC_MESSAGES/minicom.mo
-share/locale/fi_FI/LC_MESSAGES/minicom.mo
-share/locale/ja_JP.ujis/LC_MESSAGES/minicom.mo
-share/locale/ja_JP.sjis/LC_MESSAGES/minicom.mo
 @dirrm share/doc/minicom/tables
 @dirrm share/doc/minicom/demos
 @dirrm share/doc/minicom