Update to version 2.00.0.

Unforbid because known vulnerabilities have been fixed.
Take over maintainership.

Approved by:	obrien (previous maintainer)

16 files changed, 202 insertions, 304 deletions

diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index 6bf1a323b6b5..660f0069dda7 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -7,31 +7,55 @@
 #
 
 PORTNAME=	minicom
-PORTVERSION=	1.83.1
-PORTREVISION=	2
+PORTVERSION=	2.00.0
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SUNSITE}  \
-		http://www.pp.clinet.fi/~walker/mc-dev/  \
 		http://www.clinet.fi/~walker/  \
 		http://www.pp.clinet.fi/~walker/
 MASTER_SITE_SUBDIR=	apps/serialcomm/dialout
-DISTFILES=	${DISTNAME}.src${EXTRACT_SUFX}
+DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 
-FORBIDDEN=	"Local exploit yielding setuid uucp"
-
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	anders@FreeBSD.org
 
 RUN_DEPENDS=	lrz:${PORTSDIR}/comms/lrzsz \
 		lsz:${PORTSDIR}/comms/lrzsz
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
-#USE_GMAKE=	"for ``po'' dir stuff"
+WRKSRC=		${WRKDIR}/${DISTNAME:S/.src//}
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--enable-dfl-baud=57600 \
+			--enable-dfl-port=/dev/modem \
+			--sysconfdir=${PREFIX}/etc/minicom
+USE_AUTOCONF=	yes
+
 MAN1=		minicom.1 runscript.1 ascii-xfr.1
 
+post-patch:
+	${PERL} -pi -e "s@/usr/local/bin/@${LOCALBASE}/bin/@g;s@/sz@/lsz@g; \
+		s@/sb@/lsb@g;s@/sx@/lsx@g;s@/rz@/lrz@g;s@/rb@/lrb@g; \
+		s@/rx@/lrx@g" ${WRKSRC}/src/rwconf.c
+
 .if !defined(BATCH)
-pre-install:
+pre-configure:
 	# this script creates a link from your comm port to /dev/modem
 	${SH} ${SCRIPTDIR}/create-dev-link
 .endif
 
+post-install:
+	${CHOWN} uucp:dialer ${PREFIX}/bin/minicom
+	${CHMOD} 4511 ${PREFIX}/bin/minicom
+	${INSTALL} -d -o root -g wheel -m 0755 ${PREFIX}/etc/minicom
+.if !exists(${PREFIX}/etc/minicom/minicom.users)
+	${INSTALL_DATA} ${WRKSRC}/doc/minicom.users ${PREFIX}/etc/minicom/
+.endif
+	${CHOWN} uucp ${PREFIX}/etc/minicom
+.if !defined(NOPORTDOCS)
+	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}/
+	(umask 022 && cd ${WRKSRC} && ${TAR} --exclude '*/Makefile*' \
+		 --exclude '*.orig' -chf - extras doc | ${TAR}  -xf - -C \
+		${DOCSDIR})
+.endif
+
 .include <bsd.port.mk>
diff --git a/comms/minicom/distinfo b/comms/minicom/distinfo
index 9cef5f0f837f..cd2fe638b95e 100644
--- a/comms/minicom/distinfo
+++ b/comms/minicom/distinfo
@@ -1 +1 @@
-MD5 (minicom-1.83.1.src.tar.gz) = 54311e7ab398a87088eafbe5e7c09cad
+MD5 (minicom-2.00.0.src.tar.gz) = cfae090b087b67ed04e124ab5c658e70
diff --git a/comms/minicom/files/patch-aa b/comms/minicom/files/patch-aa
deleted file mode 100644
index 682fc7c15511..000000000000
--- a/comms/minicom/files/patch-aa
+++ /dev/null
@@ -1,104 +0,0 @@
---- Makefile.orig	Sun Oct 24 10:30:09 1999
-+++ Makefile	Tue Feb  1 03:01:19 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
--LIBDIR	= /etc
--DOCDIR	= /usr/doc/minicom
--MANDIR	= /usr/man/man1
-+# BINDIR	= /usr/bin
-+# LIBDIR	= /etc
-+# DOCDIR	= /usr/doc/minicom
-+# MANDIR	= /usr/man/man1
- 
- # fmg 8/22/97: seems a more logical place for this :-)
- # Select Compile Options you want:
-@@ -40,18 +40,18 @@
- # -D_I18N_		- Internationalization and localized text strings
- #			  see file "../doc/Locales"
- #
--OPFLAGS	= -D_HISTORY -D_HAVE_MACROS -D_SEARCH_HISTORY -D_I18N_
-+OPFLAGS	= -D_HISTORY -D_HAVE_MACROS -D_SEARCH_HISTORY ## -D_I18N_
- 
- # Remove if you don't have gettext and don't want to install it and use
- # the localized strings
- PO	= po
- 
- # Where to install things for FreeBSD sites.
--# BINDIR = /usr/local/bin
--# LIBDIR = /usr/local/etc/minicom
-+BINDIR = $(PREFIX)/bin
-+LIBDIR = $(PREFIX)/etc/minicom
- ##DOCDIR = /usr/local/share/minicom
--# DOCDIR = /usr/local/etc/minicom
--# MANDIR = /usr/local/man/man1
-+DOCDIR = $(PREFIX)/etc/minicom
-+MANDIR = $(PREFIX)/man/man1
- 
- # Where to install things for "normal" sites.
- # BINDIR	= /usr/local/bin
-@@ -60,17 +60,17 @@
- # MANDIR	= /usr/local/man/man1
- 
- # Take these compilation flags for Linux with libncurses.
--FLAGS	= -Wall -D_POSIX -D_SYSV -D_SELECT -pipe # -I/usr/include/ncurses
--PROGS	= minicom runscript ascii-xfr
--LFLAGS	= -s
--LIBS	= -lncurses #-lintl
--CC	= cc
-+# FLAGS	= -Wall -D_POSIX -D_SYSV -D_SELECT -pipe # -I/usr/include/ncurses
-+# PROGS	= minicom runscript ascii-xfr
-+# LFLAGS	= -s
-+# LIBS	= -lncurses #-lintl
-+# CC	= cc
- 
- # Take these compilation flags for FreeBSD.
--#FLAGS	= -Wall -D_POSIX -D_BSD43 -D_SELECT -D_DCDFLOW
--#PROGS	= minicom runscript ascii-xfr
--#LFLAGS	= -s
--#LIBS	= -ltermcap
-+FLAGS	= -Wall -D_POSIX -D_BSD43 -D_SELECT -D_DCDFLOW -D_HAVE_MACROS
-+PROGS	= minicom runscript ascii-xfr
-+LFLAGS	= -s
-+LIBS	= -ltermcap -lcurses
- #CC	= cc
- 
- # Take these flags for SCO unix.
-@@ -185,7 +185,7 @@
- SOBJS	= script.o sysdep1.o common.o
- 
- # fmg 8/22/97: merge in new OPFLAGS...
--CFLAGS	= $(FLAGS) $(OPFLAGS) -DLIBDIR=\"$(LIBDIR)\"
-+CFLAGS	+= $(FLAGS) $(OPFLAGS) -DLIBDIR=\"$(LIBDIR)\"
- 
- R	= $(ROOTDIR)
- 
-@@ -195,7 +195,7 @@
- 		$(CC) $(LFLAGS) -o minicom $(MOBJS) $(LIBS)
- 
- po: dummy
--		$(MAKE) -C po
-+ 		## cd po ; $(MAKE)
- 
- keyserv:	$(KOBJS)
- 		$(CC) -o keyserv $(LFLAGS) $(KOBJS) $(LIBS)
-@@ -248,7 +248,7 @@
- dummy:
- 
- install:	$(PROGS)
--		$(MAKE) -C po install R=$(R)
-+ 		## cd po ; $(MAKE) install R=$(R)
- 		sh install.sh $(R)$(LIBDIR) $(R)$(BINDIR) $(R)$(MANDIR) $(R)$(DOCDIR)
- 
- install2:	$(PROGS)
-@@ -256,7 +256,7 @@
- 
- clobber:
- 		rm -f *.o *~ minicom keyserv runscript ascii-xfr
--		$(MAKE) -C po clean
-+ 		## cd po ; $(MAKE) clean
- 
- clean:		
- 		rm -f *.o
diff --git a/comms/minicom/files/patch-ab b/comms/minicom/files/patch-ab
deleted file mode 100644
index f987bdf6d9af..000000000000
--- a/comms/minicom/files/patch-ab
+++ /dev/null
@@ -1,92 +0,0 @@
---- install.sh.orig	Tue Apr 21 10:45:42 1998
-+++ install.sh	Sun Dec 13 19:07:00 1998
-@@ -24,6 +24,7 @@
- 		exit 1
- 	fi
- fi
-+chown uucp $1
- 
- if test ! -d $2
- then
-@@ -41,8 +42,8 @@
- then
- 	echo "Installing minicom in $2"
- 	cp minicom $2/minicom
--	chown root $2/minicom
--	chgrp uucp $2/minicom
-+	chown uucp $2/minicom
-+	chgrp dialer $2/minicom
- 	chmod 755 $2/minicom
- fi
- 
-@@ -54,7 +55,7 @@
- 	cp $i $2/$i
- 	chmod 755 $2/$i
- 	chown root $2/$i
--	chgrp root $2/$i
-+	chgrp wheel $2/$i
-   fi
- done
- 
-@@ -64,7 +65,7 @@
- 	cp keyserv $1/keyserv
- 	chmod 755 $1/keyserv
- 	chown root $1/keyserv
--	chgrp root $1/keyserv
-+	chgrp wheel $1/keyserv
- fi
- 
- echo "Installing manpages in $3"
-@@ -73,7 +74,7 @@
- 	cp ../man/$i $3
- 	chmod 644 $3/$i
- 	chown root $3/$i
--	chgrp root $3/$i
-+	chgrp wheel $3/$i
- done
- 
- if [ ! -f $1/minicom.users ]
-@@ -81,7 +82,7 @@
- 	echo "Installing sample config file minicom.users in $1"
- 	cp minicom.users $1
- 	chown root $1/minicom.users
--	chgrp root $1/minicom.users
-+	chgrp wheel $1/minicom.users
- 	chmod 644 $1/minicom.users
- fi
- 
-@@ -90,13 +91,13 @@
- if test -d $4
- then
- 		echo "Installing script demos, docs, & character tables in $4"
--		cp ../doc/* $4
-+		##cp ../doc/* $4
- 		cp -r ../demos $4
- 		cp -r ../tables $4
- 		chmod -f 644 $4/* $4/demos/* $4/tables/*
- 		chmod -f a+x $4/demos $4/tables
- 		chown -f root $4/* $4/demos/* $4/tables/*
--		chgrp -f root $4/* $4/demos/* $4/tables/*
-+		chgrp -f wheel $4/* $4/demos/* $4/tables/*
- else
- 	echo "You don't have a $4 directory - script examples not installed."
- fi
-@@ -106,11 +107,12 @@
-     rm minicom.o
- fi
- 	
--echo "Minicom is NOT setuid yet - you must do this yourself by entering:"
--echo
--echo "chmod +s $2/minicom"
--echo
--echo "or make your modem device in the /dev directory world writable "
--echo "with chmod a+rw"
-+###echo "Minicom is NOT setuid yet - you must do this yourself by entering:"
-+###echo
-+###echo "chmod +s $2/minicom"
-+###echo
-+chmod u+s $2/minicom
-+###echo "or make your modem device in the /dev directory world writable "
-+###echo "with chmod a+rw"
- 
- exit 0
diff --git a/comms/minicom/files/patch-ac b/comms/minicom/files/patch-ac
index 30504065e1ea..880e95199761 100644
--- a/comms/minicom/files/patch-ac
+++ b/comms/minicom/files/patch-ac
@@ -1,7 +1,7 @@
---- 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 */
+--- src/updown.c.orig	Sun Jan 27 18:45:22 2002
++++ src/updown.c	Sun Jan 27 18:45:58 2002
+@@ -245,7 +245,7 @@
+     do_log("%s", 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/files/patch-ad b/comms/minicom/files/patch-ad
deleted file mode 100644
index 3ee2993f5082..000000000000
--- a/comms/minicom/files/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
---- rwconf.c.orig	Sun Apr 28 07:22:28 1996
-+++ rwconf.c	Sun Nov 24 00:41:47 1996
-@@ -70,12 +70,12 @@
-   { "/usr/bin/kermit -i -l %l -r", PUBLIC, "pprog8" },
- #else
-   /* Most sites have this in /usr/local, except Linux. */
--  { "/usr/local/bin/sz -vv",	PUBLIC,   "pprog1" },
--  { "/usr/local/bin/sb -vv",	PUBLIC,   "pprog2" },
--  { "/usr/local/bin/sx -vv",	PUBLIC,   "pprog3" },
--  { "/usr/local/bin/rz -vv",	PUBLIC,   "pprog4" },
--  { "/usr/local/bin/rb -vv",	PUBLIC,   "pprog5" },
--  { "/usr/local/bin/rx -vv",	PUBLIC,   "pprog6" },
-+  { "/usr/local/bin/lsz -vv",	PUBLIC,   "pprog1" },
-+  { "/usr/local/bin/lsb -vv",	PUBLIC,   "pprog2" },
-+  { "/usr/local/bin/lsx -vv",	PUBLIC,   "pprog3" },
-+  { "/usr/local/bin/lrz -vv",	PUBLIC,   "pprog4" },
-+  { "/usr/local/bin/lrb -vv",	PUBLIC,   "pprog5" },
-+  { "/usr/local/bin/lrx -vv",	PUBLIC,   "pprog6" },
-   { "/usr/local/bin/kermit -i -l %l -s", PUBLIC, "pprog7" },
-   { "/usr/local/bin/kermit -i -l %l -r", PUBLIC, "pprog8" },
- #endif
diff --git a/comms/minicom/files/patch-af b/comms/minicom/files/patch-af
index 9804c1f66c8c..387e345e911a 100644
--- a/comms/minicom/files/patch-af
+++ b/comms/minicom/files/patch-af
@@ -1,6 +1,6 @@
---- window.c.orig	Tue Aug 11 03:10:29 1998
-+++ window.c	Tue Aug 11 03:07:12 1998
-@@ -104,7 +104,7 @@
+--- src/window.c.orig	Sun Jan 27 18:57:13 2002
++++ src/window.c	Sun Jan 27 18:57:25 2002
+@@ -110,7 +110,7 @@
  
  int useattr = 1;
  int dirflush = 1;
diff --git a/comms/minicom/files/patch-ag b/comms/minicom/files/patch-ag
index 0a4f6e128464..9e099c5aca75 100644
--- a/comms/minicom/files/patch-ag
+++ b/comms/minicom/files/patch-ag
@@ -1,14 +1,14 @@
---- windiv.c.orig	Mon Mar  2 14:28:51 1998
-+++ windiv.c	Tue Aug 11 02:48:32 1998
-@@ -12,6 +12,7 @@
-  *
-  * hgk+jl 02.98 File selection window
-  */
+--- src/windiv.c.orig	Mon Jan 31 21:12:08 2000
++++ src/windiv.c	Sun Jan 27 19:05:05 2002
+@@ -19,6 +19,7 @@
+ #include "rcsid.h"
+ RCSID("$Id: windiv.c,v 1.2 2000/01/27 11:25:31 misiek Exp $")
+ 
 +#include <sys/types.h>
  #include <dirent.h>
  #include <sys/stat.h>
  #include "port.h"
-@@ -244,8 +245,14 @@
+@@ -251,8 +252,14 @@
  
        /* get regular files */
        dirlist[nCnt].d_ino    = dirent->d_ino;
diff --git a/comms/minicom/files/patch-ai b/comms/minicom/files/patch-ai
deleted file mode 100644
index a1cefc1255c8..000000000000
--- a/comms/minicom/files/patch-ai
+++ /dev/null
@@ -1,28 +0,0 @@
---- config.h.orig	Wed Mar 15 08:25:21 2000
-+++ config.h	Thu Sep 28 09:38:44 2000
-@@ -18,10 +18,16 @@
-  * and adjust them to your system.
-  */
- 
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#include <paths.h>
-+#endif
-+
- /* Operating system INdependant parameters. (Usually the same everywhere) */
- #define KERMIT "/usr/local/bin/kermit -l %l -b %b"	/* How to call kermit */
- #ifdef SVR4_LOCKS
- #	define UUCPLOCK	"/var/spool/locks"	/* SVR4 version of Lock file directory */
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#	define UUCPLOCK	_PATH_UUCPLOCK		/* Lock file directory */
- #else
- #	define UUCPLOCK	"/var/spool/uucp"	/* Lock file directory */
- #endif
-@@ -62,7 +68,7 @@
- 
- #ifdef __FreeBSD__
- #  define DFL_PORT "/dev/modem"
--#  define DEF_BAUD "19200"
-+#  define DEF_BAUD "57600"
- #  define CALLOUT  ""
- #  define CALLIN   ""
- #endif
diff --git a/comms/minicom/files/patch-ba b/comms/minicom/files/patch-ba
deleted file mode 100644
index 635df74ef8e2..000000000000
--- a/comms/minicom/files/patch-ba
+++ /dev/null
@@ -1,13 +0,0 @@
---- ascii-xfr.c.orig	Sun Mar  8 08:10:26 1998
-+++ ascii-xfr.c	Sun Dec 13 21:55:16 1998
-@@ -14,6 +14,10 @@
- #include <string.h>
- #include <time.h>
- #include <fcntl.h>
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>		/* get BSD definition if present */
-+#endif
-+
- 
- /*
-  *	Externals.
diff --git a/comms/minicom/files/patch-configure.in b/comms/minicom/files/patch-configure.in
new file mode 100644
index 000000000000..fdce96459ccb
--- /dev/null
+++ b/comms/minicom/files/patch-configure.in
@@ -0,0 +1,11 @@
+--- configure.in.orig	Sun Sep 30 15:10:33 2001
++++ configure.in	Sun Jan 27 23:12:28 2002
+@@ -249,7 +242,7 @@
+ 	KEYSERV="",
+ 	KEYSERV="minicom.keyserv")
+ AC_SUBST(KEYSERV)
+-AC_REPLACE_FUNCS(snprintf usleep getopt getopt_long)
++AC_REPLACE_FUNCS(snprintf usleep)
+ 
+ dnl system capabilities
+ AC_SYS_LONG_FILE_NAMES
diff --git a/comms/minicom/files/patch-lib-Makefile.in b/comms/minicom/files/patch-lib-Makefile.in
new file mode 100644
index 000000000000..106c1af26a93
--- /dev/null
+++ b/comms/minicom/files/patch-lib-Makefile.in
@@ -0,0 +1,29 @@
+--- lib/Makefile.in.orig	Mon Oct  1 16:21:53 2001
++++ lib/Makefile.in	Sun Jan 27 19:41:15 2002
+@@ -73,7 +73,7 @@
+ INTLLIBS = @INTLLIBS@
+ INTLOBJS = @INTLOBJS@
+ KEYSERV = @KEYSERV@
+-LIBOBJS = @LIBOBJS@
++LIBOBJS = @LIBOBJS@ getopt.o getopt_long.o
+ MAKEINFO = @MAKEINFO@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+@@ -93,7 +93,7 @@
+ 
+ libport_a_SOURCES = 
+ 
+-libport_a_LIBADD = @LIBOBJS@
++libport_a_LIBADD = @LIBOBJS@ getopt.o getopt_long.o
+ 
+ AUTOMAKE_OPTIONS = dist-tarZ no-dependencies 1.0
+ mkinstalldirs = $(SHELL) $(top_srcdir)/aux/mkinstalldirs
+@@ -106,7 +106,7 @@
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+-libport_a_DEPENDENCIES =  @LIBOBJS@
++libport_a_DEPENDENCIES =  @LIBOBJS@ getopt.o getopt_long.o
+ libport_a_OBJECTS = 
+ AR = ar
+ CFLAGS = @CFLAGS@
diff --git a/comms/minicom/files/patch-minirc.dfl b/comms/minicom/files/patch-minirc.dfl
new file mode 100644
index 000000000000..e13f5c406afb
--- /dev/null
+++ b/comms/minicom/files/patch-minirc.dfl
@@ -0,0 +1,10 @@
+--- doc/minirc.dfl.orig	Sun Jan 27 23:21:45 2002
++++ doc/minirc.dfl	Sun Jan 27 23:21:49 2002
+@@ -1,2 +1,7 @@
+ # $Id: minirc.dfl,v 1.1.1.1 1999/12/18 11:18:51 misiek Exp $
+ # Machine-generated file - use "minicom -s" to change parameters.
++pr port             /dev/cuaa0
++pu baudrate         9600
++pu bits             8
++pu parity           N
++pu minit            
diff --git a/comms/minicom/files/patch-src-Makefile.in b/comms/minicom/files/patch-src-Makefile.in
new file mode 100644
index 000000000000..4b6af80d3e91
--- /dev/null
+++ b/comms/minicom/files/patch-src-Makefile.in
@@ -0,0 +1,14 @@
+--- src/Makefile.in.orig	Sun Jan 27 19:22:40 2002
++++ src/Makefile.in	Sun Jan 27 19:23:19 2002
+@@ -108,9 +108,9 @@
+ 
+ AUTOMAKE_OPTIONS = dist-tarZ no-dependencies 1.0
+ 
+-minicom_LDADD = @INTLLIBS@
++minicom_LDADD = @INTLLIBS@ ../lib/getopt.o ../lib/getopt_long.o
+ 
+-runscript_LDADD = @INTLLIBS@
++runscript_LDADD = @INTLLIBS@ ../lib/getopt.o ../lib/getopt_long.o
+ 
+ LDADD = $(top_builddir)/lib/libport.a
+ CPPFLAGS = @CPPFLAGS@  -I$(top_srcdir)/lib
diff --git a/comms/minicom/files/patch-sysdep1.c b/comms/minicom/files/patch-sysdep1.c
index 3e38e2eb6b65..f4ba12309e6a 100644
--- a/comms/minicom/files/patch-sysdep1.c
+++ b/comms/minicom/files/patch-sysdep1.c
@@ -1,27 +1,53 @@
---- sysdep1.c.orig	Wed Mar 15 08:45:03 2000
-+++ sysdep1.c	Fri Nov 10 09:26:24 2000
-@@ -69 +69 @@
+--- src/sysdep1.c.orig	Sat Jun 24 18:01:29 2000
++++ src/sysdep1.c	Sun Jan 27 19:15:37 2002
+@@ -71,12 +71,12 @@
+ void m_setrts(fd)
+ int fd;
+ {
 -#if defined(TIOCM_RTS) && defined(TIOCMODG)
 +#if defined(TIOCM_RTS) && defined(TIOCMGET)
-@@ -72 +72 @@
+   int mcs=0;
+ 
 -  ioctl(fd, TIOCMODG, &mcs);
 +  ioctl(fd, TIOCMGET, &mcs);
-@@ -74 +74 @@
+   mcs |= TIOCM_RTS;
 -  ioctl(fd, TIOCMODS, &mcs);
 +  ioctl(fd, TIOCMSET, &mcs);
-@@ -180 +180 @@
+ #endif
+ #ifdef _COHERENT
+   ioctl(fd, TIOCSRTS, 0);
+@@ -182,10 +182,10 @@
+ int m_getdcd(fd)
+ int fd;
+ {
 -#ifdef TIOCMODG
 +#ifdef TIOCMGET
-@@ -183 +183 @@
+   int mcs=0;
+    
 -  ioctl(fd, TIOCMODG, &mcs);
 +  ioctl(fd, TIOCMGET, &mcs);
-@@ -221,2 +221,2 @@
+   return(mcs & TIOCM_CAR ? 1 : 0);
+ #else
+   (void)fd;
+@@ -223,8 +223,8 @@
+   ioctl(fd, TIOCLGET, &lsw);
+ #  endif
+ #endif
 -#ifdef TIOCMODG
 -  ioctl(fd, TIOCMODG, &m_word);
 +#ifdef TIOCMGET
 +  ioctl(fd, TIOCMGET, &m_word);
-@@ -243,2 +243,2 @@
+ #endif
+ }
+ 
+@@ -245,8 +245,8 @@
+   ioctl(fd, TIOCLSET, &lsw);
+ #  endif
+ #endif
 -#ifdef TIOCMODS
 -  ioctl(fd, TIOCMODS, &m_word);
 +#ifdef TIOCMSET
 +  ioctl(fd, TIOCMSET, &m_word);
+ #endif
+ }
+ 
diff --git a/comms/minicom/pkg-plist b/comms/minicom/pkg-plist
index edd6ad0eef09..d312783151e8 100644
--- a/comms/minicom/pkg-plist
+++ b/comms/minicom/pkg-plist
@@ -1,19 +1,61 @@
-@comment $FreeBSD$
 bin/minicom
 bin/xminicom
 bin/runscript
 bin/ascii-xfr
 etc/minicom/minicom.users
-etc/minicom/tables/mc.pc8
-etc/minicom/tables/mc.sf7
-etc/minicom/tables/mc.iso
-etc/minicom/tables/mc.noconv
-etc/minicom/demos/htsalogin
-etc/minicom/demos/saralogin
-etc/minicom/demos/scriptdemo
-etc/minicom/demos/unixlogin
 @exec /usr/sbin/chown uucp %D/etc/minicom
-@dirrm etc/minicom/demos
-@dirrm etc/minicom/tables
-@comment deal with bogus Bento errorlogs, user has config files in etc/minicom
 @unexec rmdir %D/etc/minicom 2>/dev/null || true
+%%PORTDOCS%%share/doc/minicom/AUTHORS
+%%PORTDOCS%%share/doc/minicom/COPYING
+%%PORTDOCS%%share/doc/minicom/ChangeLog
+%%PORTDOCS%%share/doc/minicom/doc/Announce-1.78
+%%PORTDOCS%%share/doc/minicom/doc/Announce-1.82
+%%PORTDOCS%%share/doc/minicom/doc/Announce-1.82.1
+%%PORTDOCS%%share/doc/minicom/doc/Announce-1.83
+%%PORTDOCS%%share/doc/minicom/doc/COMPATABILITY.lrzsz
+%%PORTDOCS%%share/doc/minicom/doc/ChangeLog.old
+%%PORTDOCS%%share/doc/minicom/doc/HistSearch
+%%PORTDOCS%%share/doc/minicom/doc/Locales
+%%PORTDOCS%%share/doc/minicom/doc/Macros
+%%PORTDOCS%%share/doc/minicom/doc/QuickStart.modemu
+%%PORTDOCS%%share/doc/minicom/doc/README.lrzsz
+%%PORTDOCS%%share/doc/minicom/doc/RedHat
+%%PORTDOCS%%share/doc/minicom/doc/TODO.lrzsz
+%%PORTDOCS%%share/doc/minicom/doc/Todo
+%%PORTDOCS%%share/doc/minicom/doc/Todo.175
+%%PORTDOCS%%share/doc/minicom/doc/Todo.Irix.dif
+%%PORTDOCS%%share/doc/minicom/doc/Todo.emacskey.dif
+%%PORTDOCS%%share/doc/minicom/doc/Todo.fsel
+%%PORTDOCS%%share/doc/minicom/doc/copyright.modemu
+%%PORTDOCS%%share/doc/minicom/doc/fselector.txt
+%%PORTDOCS%%share/doc/minicom/doc/japanese
+%%PORTDOCS%%share/doc/minicom/doc/minicom.FAQ
+%%PORTDOCS%%share/doc/minicom/doc/minicom.users
+%%PORTDOCS%%share/doc/minicom/doc/minirc.dfl
+%%PORTDOCS%%share/doc/minicom/doc/modemu.README
+%%PORTDOCS%%share/doc/minicom/doc/pl-translation.txt
+%%PORTDOCS%%share/doc/minicom/doc/portugues-brasil
+%%PORTDOCS%%share/doc/minicom/doc/suomeksi
+%%PORTDOCS%%share/doc/minicom/extras/htsalogin
+%%PORTDOCS%%share/doc/minicom/extras/linux/INSTALL
+%%PORTDOCS%%share/doc/minicom/extras/linux/README-FIRST
+%%PORTDOCS%%share/doc/minicom/extras/linux/mtelnet
+%%PORTDOCS%%share/doc/minicom/extras/saralogin
+%%PORTDOCS%%share/doc/minicom/extras/scriptdemo
+%%PORTDOCS%%share/doc/minicom/extras/tables/mc.iso
+%%PORTDOCS%%share/doc/minicom/extras/tables/mc.noconv
+%%PORTDOCS%%share/doc/minicom/extras/tables/mc.pc8
+%%PORTDOCS%%share/doc/minicom/extras/tables/mc.sf7
+%%PORTDOCS%%share/doc/minicom/extras/termcap/README
+%%PORTDOCS%%share/doc/minicom/extras/termcap/termcap.long
+%%PORTDOCS%%share/doc/minicom/extras/termcap/termcap.short
+%%PORTDOCS%%share/doc/minicom/extras/terminfo/README
+%%PORTDOCS%%share/doc/minicom/extras/terminfo/minicom
+%%PORTDOCS%%share/doc/minicom/extras/unixlogin
+%%PORTDOCS%%@dirrm share/doc/minicom/doc
+%%PORTDOCS%%@dirrm share/doc/minicom/extras/linux
+%%PORTDOCS%%@dirrm share/doc/minicom/extras/tables
+%%PORTDOCS%%@dirrm share/doc/minicom/extras/termcap
+%%PORTDOCS%%@dirrm share/doc/minicom/extras/terminfo
+%%PORTDOCS%%@dirrm share/doc/minicom/extras
+%%PORTDOCS%%@dirrm share/doc/minicom