From c5c73de58ec5eb19c19b2bce65d9a27d7987625c Mon Sep 17 00:00:00 2001
From: form <form@openbsd.org>
Date: Thu, 18 May 2000 04:41:30 +0000
Subject: [PATCH] Upgrade to 1.83.0. Use INSTALL/DEINSTALL. Fake.

---
 comms/minicom/Makefile                        |  46 ++---
 comms/minicom/files/md5                       |   6 +-
 comms/minicom/files/xminicom.in               |  15 ++
 comms/minicom/patches/patch-aa                | 162 ------------------
 comms/minicom/patches/patch-ab                | 159 -----------------
 comms/minicom/patches/patch-ag                |  31 ----
 comms/minicom/patches/patch-ah                |  11 --
 comms/minicom/patches/patch-ai                |  13 --
 comms/minicom/patches/patch-ak                |  43 -----
 .../patches/{patch-af => patch-ascii-xfr-c}   |   2 +
 comms/minicom/patches/patch-config-h          |  20 +++
 comms/minicom/patches/patch-install-sh        | 130 ++++++++++++++
 comms/minicom/patches/patch-makefile          |  98 +++++++++++
 comms/minicom/patches/patch-minicom-users     |  16 ++
 comms/minicom/patches/patch-po-makefile       |  26 +++
 comms/minicom/patches/patch-port-h            |  17 ++
 .../patches/{patch-aj => patch-rwconf-c}      |   2 +
 .../patches/{patch-ad => patch-updown-c}      |   2 +
 comms/minicom/patches/patch-util-c            |  32 ++++
 .../patches/{patch-ae => patch-windiv-c}      |   2 +
 .../patches/{patch-ac => patch-window-c}      |   2 +
 comms/minicom/pkg/DEINSTALL                   |  24 +++
 comms/minicom/pkg/INSTALL                     |  69 ++++++++
 comms/minicom/pkg/PLIST                       |  44 +++--
 24 files changed, 511 insertions(+), 461 deletions(-)
 create mode 100644 comms/minicom/files/xminicom.in
 delete mode 100644 comms/minicom/patches/patch-aa
 delete mode 100644 comms/minicom/patches/patch-ab
 delete mode 100644 comms/minicom/patches/patch-ag
 delete mode 100644 comms/minicom/patches/patch-ah
 delete mode 100644 comms/minicom/patches/patch-ai
 delete mode 100644 comms/minicom/patches/patch-ak
 rename comms/minicom/patches/{patch-af => patch-ascii-xfr-c} (82%)
 create mode 100644 comms/minicom/patches/patch-config-h
 create mode 100644 comms/minicom/patches/patch-install-sh
 create mode 100644 comms/minicom/patches/patch-makefile
 create mode 100644 comms/minicom/patches/patch-minicom-users
 create mode 100644 comms/minicom/patches/patch-po-makefile
 create mode 100644 comms/minicom/patches/patch-port-h
 rename comms/minicom/patches/{patch-aj => patch-rwconf-c} (93%)
 rename comms/minicom/patches/{patch-ad => patch-updown-c} (97%)
 create mode 100644 comms/minicom/patches/patch-util-c
 rename comms/minicom/patches/{patch-ae => patch-windiv-c} (92%)
 rename comms/minicom/patches/{patch-ac => patch-window-c} (78%)
 create mode 100644 comms/minicom/pkg/DEINSTALL
 create mode 100644 comms/minicom/pkg/INSTALL

diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index 0cfbeea5487..d0692ec5d3e 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -1,36 +1,38 @@
-# $OpenBSD: Makefile,v 1.23 2000/04/09 17:36:09 espie Exp $
+# $OpenBSD: Makefile,v 1.24 2000/05/18 04:41:30 form Exp $
 
-BROKEN=		installs files automatically in /etc
-
-PKGNAME=	minicom-1.82.1
+PKGNAME=	minicom-1.83.0
 DISTNAME=	${PKGNAME}.src
 CATEGORIES=	comms
-NEED_VERSION=	 1.230
-FAKE=No
+NEED_VERSION=	1.230
+FAKE=		Yes
 
 MAINTAINER=     form@openbsd.org
 
-LICENSE_TYPE=		GPL
-PERMIT_PACKAGE_CDROM=	YES
-PERMIT_PACKAGE_FTP=	YES
-PERMIT_DISTFILES_CDROM=	YES
-PERMIT_DISTFILES_FTP=	YES
-
-MASTER_SITES=	${MASTER_SITE_SUNSITE}  \
-		http://www.clinet.fi/~walker/
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
 
+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
 
-RUN_DEPENDS=	kermit::comms/kermit
-RUN_DEPENDS+=	lrz::comms/lrzsz
+BUILD_DEPENDS=	gmake::devel/gmake msgfmt::devel/gettext
+RUN_DEPENDS=	kermit::comms/kermit lrz::comms/lrzsz
 
-WRKDIST=		${WRKDIR}/${PKGNAME}/src
+MAKE_ENV=	GMAKE="${GMAKE}"
+
+WRKDIST=	${WRKDIR}/${PKGNAME}/src
+
+pre-build:
+	@mv ${WRKBUILD}/xminicom ${WRKBUILD}/xminicom.orig
+	@sed -e "s,@PREFIX@,${PREFIX},g" -e "s,@X11BASE@,${X11BASE},g" \
+		${FILESDIR}/xminicom.in > ${WRKBUILD}/xminicom
 
 post-install:
-.if exists(/etc/minicom/minicom.users)
-	@echo "*** Found existing /etc/minicom/minicom.users -- not replacing."
-.else
-	${INSTALL_DATA} ${WRKSRC}/minicom.users /etc/minicom
-.endif
+	${INSTALL_DATA_DIR} ${PREFIX}/share/minicom
+	${INSTALL_DATA} ${WRKBUILD}/minicom.users ${PREFIX}/share/minicom
 
 .include <bsd.port.mk>
diff --git a/comms/minicom/files/md5 b/comms/minicom/files/md5
index 1a2c308760b..c484353492e 100644
--- a/comms/minicom/files/md5
+++ b/comms/minicom/files/md5
@@ -1,3 +1,3 @@
-SHA1 (minicom-1.82.1.src.tar.gz) = dc5d0e378c9681286886c522305da64fd3cfc9e3
-RMD160 (minicom-1.82.1.src.tar.gz) = 3634f0c0e499e098eb54990e28e4b7e943ba9d4e
-MD5 (minicom-1.82.1.src.tar.gz) = 67cddf3fc1857608edc2513be6fc58f2
+MD5 (minicom-1.83.0.src.tar.gz) = aea4e7d7280b443004c459f35a13d3ce
+RMD160 (minicom-1.83.0.src.tar.gz) = 8bcb54fbeabcc667de239718dfe3bf9830b756ba
+SHA1 (minicom-1.83.0.src.tar.gz) = 2449e93046cc02a63fa2fe062a3d38c74565aadc
diff --git a/comms/minicom/files/xminicom.in b/comms/minicom/files/xminicom.in
new file mode 100644
index 00000000000..675d54e2f5b
--- /dev/null
+++ b/comms/minicom/files/xminicom.in
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# $OpenBSD: xminicom.in,v 1.1 2000/05/18 04:41:30 form Exp $
+#
+# Run minicom in X-Windows environment
+#
+XTERM=@X11BASE@/bin/xterm
+
+if [ -x ${XTERM} ]; then
+	exec ${XTERM} -fg grey -bg black -n minicom -T minicom -geometry 80x25 \
+		-e @PREFIX@/bin/minicom -m -c on $*
+fi
+
+echo "xminicom: can't execute ${XTERM}" >&2
+exit 1
diff --git a/comms/minicom/patches/patch-aa b/comms/minicom/patches/patch-aa
deleted file mode 100644
index 68d3091b556..00000000000
--- a/comms/minicom/patches/patch-aa
+++ /dev/null
@@ -1,162 +0,0 @@
-*** Makefile.orig	Sun Jul 26 02:05:46 1998
---- Makefile	Fri Dec 18 14:58:50 1998
-***************
-*** 22,31 ****
-  #
-  
-  # Where to install things for Linux sites (FSSTND)
-! 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:
---- 22,31 ----
-  #
-  
-  # Where to install things for Linux sites (FSSTND)
-! # 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,57 ****
-  # -D_I18N_		- Internationalization and localized text strings
-  #			  see file "../doc/Locales"
-  #
-! 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
-  ##DOCDIR = /usr/local/share/minicom
-! # DOCDIR = /usr/local/etc/minicom
-! # MANDIR = /usr/local/man/man1
-  
-  # Where to install things for "normal" sites.
-  # BINDIR	= /usr/local/bin
---- 40,63 ----
-  # -D_I18N_		- Internationalization and localized text strings
-  #			  see file "../doc/Locales"
-  #
-! 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 = $(PREFIX)/bin
-! # LIBDIR = $(PREFIX)/etc/minicom
-  ##DOCDIR = /usr/local/share/minicom
-! # DOCDIR = $(PREFIX)/etc/minicom
-! # MANDIR = $(PREFIX)/man/man1
-! 
-! # Where to install things for OpenBSD sites.
-! BINDIR = $(PREFIX)/bin
-! LIBDIR = /etc/minicom
-! DOCDIR = $(PREFIX)/share/minicom
-! MANDIR = $(PREFIX)/man/man1
-  
-  # Where to install things for "normal" sites.
-  # BINDIR	= /usr/local/bin
-***************
-*** 60,78 ****
-  # 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
-  
-- # 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
-- #CC	= cc
-- 
-  # Take these flags for SCO unix.
-  #FLAGS	= -D_SYSV -D_SCO -D_POSIX -D_SELECT
-  #PROGS	= minicom runscript ascii-xfr
---- 66,91 ----
-  # 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
-! 
-! # Take these compilation flags for FreeBSD.
-! # 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 compilation flags for OpenBSD.
-! FLAGS	= -Wall -D_POSIX -D_BSD43 -D_SELECT -D_DCDFLOW -D_HAVE_MACROS
-  PROGS	= minicom runscript ascii-xfr
-  LFLAGS	= -s
-! LIBS	= -lcurses
-  CC	= cc
-  
-  # Take these flags for SCO unix.
-  #FLAGS	= -D_SYSV -D_SCO -D_POSIX -D_SELECT
-  #PROGS	= minicom runscript ascii-xfr
-***************
-*** 188,194 ****
-  		$(CC) $(LFLAGS) -o minicom $(MOBJS) $(LIBS)
-  
-  po: dummy
-! 		make -C po
-  
-  keyserv:	$(KOBJS)
-  		$(CC) -o keyserv $(LFLAGS) $(KOBJS) $(LIBS)
---- 201,207 ----
-  		$(CC) $(LFLAGS) -o minicom $(MOBJS) $(LIBS)
-  
-  po: dummy
-! 		## cd po ; $(MAKE)
-  
-  keyserv:	$(KOBJS)
-  		$(CC) -o keyserv $(LFLAGS) $(KOBJS) $(LIBS)
-***************
-*** 241,252 ****
-  dummy:
-  
-  install:	$(PROGS)
-! 		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
-  
-  clean:		
-  		rm -f *.o
---- 254,265 ----
-  dummy:
-  
-  install:	$(PROGS)
-! 		## cd po ; $(MAKE) install R=$(R)
-  		sh install.sh $(R)$(LIBDIR) $(R)$(BINDIR) $(R)$(MANDIR) $(R)$(DOCDIR)
-  
-  clobber:
-  		rm -f *.o *~ minicom keyserv runscript ascii-xfr
-! 		## cd po ; $(MAKE) clean
-  
-  clean:		
-  		rm -f *.o
diff --git a/comms/minicom/patches/patch-ab b/comms/minicom/patches/patch-ab
deleted file mode 100644
index 0ee937b1c38..00000000000
--- a/comms/minicom/patches/patch-ab
+++ /dev/null
@@ -1,159 +0,0 @@
-*** install.sh.orig	Wed Apr 22 00:45:42 1998
---- install.sh	Fri Dec 18 16:09:21 1998
-***************
-*** 24,29 ****
---- 24,30 ----
-  		exit 1
-  	fi
-  fi
-+ chown uucp $1
-  
-  if test ! -d $2
-  then
-***************
-*** 41,48 ****
-  then
-  	echo "Installing minicom in $2"
-  	cp minicom $2/minicom
-! 	chown root $2/minicom
-! 	chgrp uucp $2/minicom
-  	chmod 755 $2/minicom
-  fi
-  
---- 42,49 ----
-  then
-  	echo "Installing minicom in $2"
-  	cp minicom $2/minicom
-! 	chown uucp $2/minicom
-! 	chgrp dialer $2/minicom
-  	chmod 755 $2/minicom
-  fi
-  
-***************
-*** 54,60 ****
-  	cp $i $2/$i
-  	chmod 755 $2/$i
-  	chown root $2/$i
-! 	chgrp root $2/$i
-    fi
-  done
-  
---- 55,61 ----
-  	cp $i $2/$i
-  	chmod 755 $2/$i
-  	chown root $2/$i
-! 	chgrp wheel $2/$i
-    fi
-  done
-  
-***************
-*** 64,70 ****
-  	cp keyserv $1/keyserv
-  	chmod 755 $1/keyserv
-  	chown root $1/keyserv
-! 	chgrp root $1/keyserv
-  fi
-  
-  echo "Installing manpages in $3"
---- 65,71 ----
-  	cp keyserv $1/keyserv
-  	chmod 755 $1/keyserv
-  	chown root $1/keyserv
-! 	chgrp wheel $1/keyserv
-  fi
-  
-  echo "Installing manpages in $3"
-***************
-*** 73,102 ****
-  	cp ../man/$i $3
-  	chmod 644 $3/$i
-  	chown root $3/$i
-! 	chgrp root $3/$i
-  done
-  
-! if [ ! -f $1/minicom.users ]
-! then
-! 	echo "Installing sample config file minicom.users in $1"
-! 	cp minicom.users $1
-! 	chown root $1/minicom.users
-! 	chgrp root $1/minicom.users
-! 	chmod 644 $1/minicom.users
-! fi
-  
-  mkdir -p $4 2>/dev/null
-  
-  if test -d $4
-  then
-! 		echo "Installing script demos, docs, & character tables in $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/*
-  else
-  	echo "You don't have a $4 directory - script examples not installed."
-  fi
---- 74,108 ----
-  	cp ../man/$i $3
-  	chmod 644 $3/$i
-  	chown root $3/$i
-! 	chgrp wheel $3/$i
-  done
-  
-! #if [ ! -f $1/minicom.users ]
-! #then
-! #	echo "Installing sample config file minicom.users in $1"
-! #	cp minicom.users $1
-! #	chown root $1/minicom.users
-! #	chgrp wheel $1/minicom.users
-! #	chmod 644 $1/minicom.users
-! #fi
-  
-  mkdir -p $4 2>/dev/null
-  
-  if test -d $4
-  then
-! 	echo "Installing script demos, docs, & character tables in $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 wheel $4/* $4/demos/* $4/tables/*
-! 	echo "Installing sample config file minicom.users in $4"
-! 	cp minicom.users $4
-! 	chown root $4/minicom.users
-! 	chgrp wheel $4/minicom.users
-! 	chmod 644 $4/minicom.users
-  else
-  	echo "You don't have a $4 directory - script examples not installed."
-  fi
-***************
-*** 106,116 ****
-      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"
-  
-  exit 0
---- 112,123 ----
-      rm minicom.o
-  fi
-  	
-! ###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/patches/patch-ag b/comms/minicom/patches/patch-ag
deleted file mode 100644
index 8bff05444ce..00000000000
--- a/comms/minicom/patches/patch-ag
+++ /dev/null
@@ -1,31 +0,0 @@
---- config.h.orig	Sat Nov  1 01:48:00 1997
-+++ config.h	Mon Dec 21 00:04:30 1998
-@@ -20,7 +20,7 @@
- 
- /* Operating system INdependant parameters. (Usually the same everywhere) */
- #define KERMIT "/usr/local/bin/kermit -l %l -b %b"	/* How to call kermit */
--#define UUCPLOCK	"/var/spool/uucp"	/* Lock file directory */
-+#define UUCPLOCK	"/var/spool/lock"	/* Lock file directory */
- #define LOGFILE		"minicom.log"		/* Not defined = not used */
- 
- /* Operating system dependant parameters, per OS. A few samples are given. */
-@@ -58,7 +58,18 @@
- 
- #ifdef __FreeBSD__
- #  define DFL_PORT "/dev/modem"
--#  define DEF_BAUD "19200"
-+#  define DEF_BAUD "38400"
-+#  define CALLOUT  ""
-+#  define CALLIN   ""
-+#endif
-+
-+#ifdef __OpenBSD__
-+#  ifdef sparc
-+#    define DFL_PORT "/dev/ttya"
-+#  else
-+#    define DFL_PORT "/dev/tty00"
-+#  endif
-+#  define DEF_BAUD "38400"
- #  define CALLOUT  ""
- #  define CALLIN   ""
- #endif
diff --git a/comms/minicom/patches/patch-ah b/comms/minicom/patches/patch-ah
deleted file mode 100644
index 6b1ef678fc5..00000000000
--- a/comms/minicom/patches/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
---- help.c.orig	Thu Feb 26 16:11:47 1998
-+++ help.c	Tue Aug 11 03:26:43 1998
-@@ -30,7 +30,7 @@
- #endif
-   x1 = (COLS / 2) - 34;
-   x2 = (COLS / 2) + 32;
--  w = wopen(x1, 3, x2, 21 + i, BDOUBLE, stdattr, mfcolor, mbcolor, 0, 0, 1);
-+  w = wopen(x1, 2, x2, 20 + i, BDOUBLE, stdattr, mfcolor, mbcolor, 0, 0, 1);
-   
-   wlocate(w, 21, 0);
-   wputs(w, _("Minicom Command Summary"));
diff --git a/comms/minicom/patches/patch-ai b/comms/minicom/patches/patch-ai
deleted file mode 100644
index c2ab49fbccf..00000000000
--- a/comms/minicom/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
---- minicom.users.orig	Thu Dec  9 09:09:01 1999
-+++ minicom.users	Thu Dec  9 09:09:37 1999
-@@ -25,8 +25,8 @@
- # User		[line]	[..line]
- #
- 
--# Everyone has access to all configurations.
--ALL
-+# Only root can access minicom by default
-+root
- 
- ## The rest are examples.
- ## # Erik only has access to the default configuration
diff --git a/comms/minicom/patches/patch-ak b/comms/minicom/patches/patch-ak
deleted file mode 100644
index e083100ea49..00000000000
--- a/comms/minicom/patches/patch-ak
+++ /dev/null
@@ -1,43 +0,0 @@
---- util.c.orig	Sat May 16 14:13:12 1998
-+++ util.c	Mon Dec 21 00:20:31 1998
-@@ -165,7 +165,7 @@
- /* Drop all priviliges (irreversable). */
- void drop_all_privs()
- {
--#ifdef HAS_REUID
-+#if defined(HAS_REUID) && !defined(__OpenBSD__)
-   /* Regain privs needed to drop privs :) */
-   setregid(real_gid, eff_gid);
-   setreuid(real_uid, eff_uid);
-@@ -183,9 +183,15 @@
- void drop_privs()
- {
- #ifdef HAS_REUID
-+# ifndef __OpenBSD__
-   setregid(eff_gid, real_gid);
-   if (setreuid(eff_uid, real_uid) < 0)
- 	fprintf(stderr, "minicom: cannot setreuid(%d, %d)\n", eff_uid, real_uid);
-+# else
-+  setegid(real_gid);
-+  if (seteuid(real_uid) < 0)
-+        fprintf(stderr, "minicom: cannot seteuid(%d)\n", real_uid);
-+# endif
-   not_suid = 1;
- #endif
- }
-@@ -194,9 +200,15 @@
- void set_privs()
- {
- #ifdef HAS_REUID
-+# ifndef __OpenBSD__
-   setregid(real_gid, eff_gid);
-   if (setreuid(real_uid, eff_uid) < 0)
- 	fprintf(stderr, "minicom: cannot setreuid(%d, %d)\n", real_uid, eff_uid);
-+# else
-+  setegid(eff_gid);
-+  if (seteuid(eff_uid) < 0)
-+	fprintf(stderr, "minicom: cannot setreuid(%d)\n", eff_uid);
-+# endif
-   not_suid = 0;
- #endif
- }
diff --git a/comms/minicom/patches/patch-af b/comms/minicom/patches/patch-ascii-xfr-c
similarity index 82%
rename from comms/minicom/patches/patch-af
rename to comms/minicom/patches/patch-ascii-xfr-c
index 635df74ef8e..688352edaae 100644
--- a/comms/minicom/patches/patch-af
+++ b/comms/minicom/patches/patch-ascii-xfr-c
@@ -1,3 +1,5 @@
+# $OpenBSD: patch-ascii-xfr-c,v 1.1 2000/05/18 04:41:32 form Exp $
+
 --- 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 @@
diff --git a/comms/minicom/patches/patch-config-h b/comms/minicom/patches/patch-config-h
new file mode 100644
index 00000000000..78882970236
--- /dev/null
+++ b/comms/minicom/patches/patch-config-h
@@ -0,0 +1,20 @@
+# $OpenBSD: patch-config-h,v 1.1 2000/05/18 04:41:32 form Exp $
+
+--- config.h.orig	Wed May 17 13:10:48 2000
++++ config.h	Wed May 17 13:15:10 2000
+@@ -63,6 +63,15 @@
+ #  define CALLIN   ""
+ #endif
+ 
++#ifdef __OpenBSD__
++#  define DFL_PORT "/dev/tty00"
++#  define DEF_BAUD "57600"
++#  define CALLOUT  ""
++#  define CALLIN   ""
++#  undef  UUCPLOCK
++#  define UUCPLOCK "/var/spool/lock"
++#endif
++
+ /* Some reasonable defaults if not defined */
+ #ifndef DFL_PORT
+ #  define DFL_PORT "/dev/tty8"
diff --git a/comms/minicom/patches/patch-install-sh b/comms/minicom/patches/patch-install-sh
new file mode 100644
index 00000000000..024ffef4216
--- /dev/null
+++ b/comms/minicom/patches/patch-install-sh
@@ -0,0 +1,130 @@
+# $OpenBSD: patch-install-sh,v 1.1 2000/05/18 04:41:32 form Exp $
+
+--- install.sh.orig	Wed Apr 22 00:45:42 1998
++++ install.sh	Thu May 18 11:26:48 2000
+@@ -15,15 +15,16 @@
+ 	exit 1
+ fi
+ 
+-if test ! -d $1
+-then
+-	mkdir $1
+-	if [ $? != 0 ]
+-	then
+-		echo "$1: No such directory"
+-		exit 1
+-	fi
+-fi
++#if test ! -d $1
++#then
++#	mkdir $1
++#	if [ $? != 0 ]
++#	then
++#		echo "$1: No such directory"
++#		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,18 +55,18 @@
+ 	cp $i $2/$i
+ 	chmod 755 $2/$i
+ 	chown root $2/$i
+-	chgrp root $2/$i
++	chgrp wheel $2/$i
+   fi
+ done
+ 
+-if test -f keyserv
+-then
+-	echo "Installing keyserv in $1"
+-	cp keyserv $1/keyserv
+-	chmod 755 $1/keyserv
+-	chown root $1/keyserv
+-	chgrp root $1/keyserv
+-fi
++#if test -f keyserv
++#then
++#	echo "Installing keyserv in $1"
++#	cp keyserv $1/keyserv
++#	chmod 755 $1/keyserv
++#	chown root $1/keyserv
++#	chgrp wheel $1/keyserv
++#fi
+ 
+ echo "Installing manpages in $3"
+ for i in minicom.1 runscript.1 ascii-xfr.1
+@@ -73,30 +74,30 @@
+ 	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 ]
+-then
+-	echo "Installing sample config file minicom.users in $1"
+-	cp minicom.users $1
+-	chown root $1/minicom.users
+-	chgrp root $1/minicom.users
+-	chmod 644 $1/minicom.users
+-fi
++#if [ ! -f $1/minicom.users ]
++#then
++#	echo "Installing sample config file minicom.users in $1"
++#	cp minicom.users $1
++#	chown root $1/minicom.users
++#	chgrp wheel $1/minicom.users
++#	chmod 644 $1/minicom.users
++#fi
+ 
+ mkdir -p $4 2>/dev/null
+ 
+ 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/patches/patch-makefile b/comms/minicom/patches/patch-makefile
new file mode 100644
index 00000000000..4b086121b1e
--- /dev/null
+++ b/comms/minicom/patches/patch-makefile
@@ -0,0 +1,98 @@
+# $OpenBSD: patch-makefile,v 1.1 2000/05/18 04:41:32 form Exp $
+
+--- Makefile.orig	Mon Oct 25 00:30:09 1999
++++ Makefile	Thu May 18 11:00:42 2000
+@@ -22,10 +22,13 @@
+ # 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
++R	= $(DESTDIR)
++GMAKE  ?= gmake
++PREFIX ?= /usr/local
++BINDIR	= $(PREFIX)/bin
++LIBDIR	= /etc/minicom
++DOCDIR	= $(PREFIX)/share/doc/minicom
++MANDIR	= $(PREFIX)/man/man1
+ 
+ # fmg 8/22/97: seems a more logical place for this :-)
+ # Select Compile Options you want:
+@@ -40,7 +43,7 @@
+ # -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
+@@ -60,11 +63,11 @@
+ # 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
+@@ -73,6 +76,13 @@
+ #LIBS	= -ltermcap
+ #CC	= cc
+ 
++# Take these compilation flags for OpenBSD.
++FLAGS	= -Wall -D_POSIX -D_BSD43 -D_SELECT -D_DCDFLOW
++PROGS	= minicom runscript ascii-xfr
++LFLAGS	= -s
++LIBS	= -lcurses
++#CC	= cc
++
+ # Take these flags for SCO unix.
+ #FLAGS	= -D_SYSV -D_SCO -D_POSIX -D_SELECT
+ #PROGS	= minicom runscript ascii-xfr
+@@ -185,7 +195,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 +205,7 @@
+ 		$(CC) $(LFLAGS) -o minicom $(MOBJS) $(LIBS)
+ 
+ po: dummy
+-		$(MAKE) -C po
++		$(GMAKE) -C po
+ 
+ keyserv:	$(KOBJS)
+ 		$(CC) -o keyserv $(LFLAGS) $(KOBJS) $(LIBS)
+@@ -248,7 +258,7 @@
+ dummy:
+ 
+ install:	$(PROGS)
+-		$(MAKE) -C po install R=$(R)
++		$(GMAKE) -C po install PREFIX=$(PREFIX)
+ 		sh install.sh $(R)$(LIBDIR) $(R)$(BINDIR) $(R)$(MANDIR) $(R)$(DOCDIR)
+ 
+ install2:	$(PROGS)
+@@ -256,7 +266,7 @@
+ 
+ clobber:
+ 		rm -f *.o *~ minicom keyserv runscript ascii-xfr
+-		$(MAKE) -C po clean
++		$(GMAKE) -C po clean
+ 
+ clean:		
+ 		rm -f *.o
diff --git a/comms/minicom/patches/patch-minicom-users b/comms/minicom/patches/patch-minicom-users
new file mode 100644
index 00000000000..25a743f25bd
--- /dev/null
+++ b/comms/minicom/patches/patch-minicom-users
@@ -0,0 +1,16 @@
+# $OpenBSD: patch-minicom-users,v 1.1 2000/05/18 04:41:32 form Exp $
+
+--- minicom.users.orig	Thu Jan 18 22:08:02 1996
++++ minicom.users	Wed May 17 13:19:45 2000
+@@ -26,7 +26,10 @@
+ #
+ 
+ # Everyone has access to all configurations.
+-ALL
++# ALL
++
++# Only root can access minicom by default
++root
+ 
+ ## The rest are examples.
+ ## # Erik only has access to the default configuration
diff --git a/comms/minicom/patches/patch-po-makefile b/comms/minicom/patches/patch-po-makefile
new file mode 100644
index 00000000000..001045b5cf9
--- /dev/null
+++ b/comms/minicom/patches/patch-po-makefile
@@ -0,0 +1,26 @@
+# $OpenBSD: patch-po-makefile,v 1.1 2000/05/18 04:41:32 form Exp $
+
+--- po/Makefile.orig	Thu May 18 10:57:15 2000
++++ po/Makefile	Thu May 18 10:59:02 2000
+@@ -1,7 +1,7 @@
+ INSTALL= /usr/bin/install -c
+ INSTALL_PROGRAM= ${INSTALL}
+ INSTALL_DATA= ${INSTALL} -m 644
+-INSTALLNLSDIR=/usr/share/locale
++INSTALLNLSDIR= $(PREFIX)/share/locale
+ 
+ MSGMERGE = msgmerge
+ 
+@@ -52,9 +52,9 @@
+ install: $(CATALOGS)
+ 	for n in $(CATALOGS); do \
+ 	    l=`basename $$n .mo`; \
+-	    $(INSTALL) -m 755 -d $(R)$(INSTALLNLSDIR)/$$l; \
+-	    $(INSTALL) -m 755 -d $(R)$(INSTALLNLSDIR)/$$l/LC_MESSAGES; \
+-	    $(INSTALL) -m 644 $$n $(R)$(INSTALLNLSDIR)/$$l/LC_MESSAGES/minicom.mo; \
++	    $(INSTALL) -m 755 -d $(INSTALLNLSDIR)/$$l; \
++	    $(INSTALL) -m 755 -d $(INSTALLNLSDIR)/$$l/LC_MESSAGES; \
++	    $(INSTALL) -m 644 $$n $(INSTALLNLSDIR)/$$l/LC_MESSAGES/minicom.mo; \
+ 	done
+ 
+ %.mo: %.po
diff --git a/comms/minicom/patches/patch-port-h b/comms/minicom/patches/patch-port-h
new file mode 100644
index 00000000000..e127d210225
--- /dev/null
+++ b/comms/minicom/patches/patch-port-h
@@ -0,0 +1,17 @@
+# $OpenBSD: patch-port-h,v 1.1 2000/05/18 04:41:32 form Exp $
+
+--- port.h.orig	Sun Oct 24 23:28:33 1999
++++ port.h	Wed May 17 13:40:24 2000
+@@ -103,7 +103,11 @@
+ 
+ /* Availability of setreuid(uid_t, uid_t) */
+ #if defined(__linux__) || defined(_BSD43) || (defined(BSD) && (BSD >= 199103))
+-#  define HAS_REUID
++#  ifdef __OpenBSD__
++#    define HAS_EUID
++#  else
++#    define HAS_REUID
++#  endif
+ #endif
+ 
+ /* Availability of fchown(int, uid_t, gid_t) */
diff --git a/comms/minicom/patches/patch-aj b/comms/minicom/patches/patch-rwconf-c
similarity index 93%
rename from comms/minicom/patches/patch-aj
rename to comms/minicom/patches/patch-rwconf-c
index 3ee2993f508..7f4a56f2497 100644
--- a/comms/minicom/patches/patch-aj
+++ b/comms/minicom/patches/patch-rwconf-c
@@ -1,3 +1,5 @@
+# $OpenBSD: patch-rwconf-c,v 1.1 2000/05/18 04:41:32 form Exp $
+
 --- rwconf.c.orig	Sun Apr 28 07:22:28 1996
 +++ rwconf.c	Sun Nov 24 00:41:47 1996
 @@ -70,12 +70,12 @@
diff --git a/comms/minicom/patches/patch-ad b/comms/minicom/patches/patch-updown-c
similarity index 97%
rename from comms/minicom/patches/patch-ad
rename to comms/minicom/patches/patch-updown-c
index 30504065e1e..9ff3d368d46 100644
--- a/comms/minicom/patches/patch-ad
+++ b/comms/minicom/patches/patch-updown-c
@@ -1,3 +1,5 @@
+# $OpenBSD $
+
 --- updown.c.orig	Thu Jul  9 14:49:47 1998
 +++ updown.c	Sun Dec 13 18:34:51 1998
 @@ -230,7 +230,7 @@
diff --git a/comms/minicom/patches/patch-util-c b/comms/minicom/patches/patch-util-c
new file mode 100644
index 00000000000..3a9a90e99c1
--- /dev/null
+++ b/comms/minicom/patches/patch-util-c
@@ -0,0 +1,32 @@
+# $OpenBSD: patch-util-c,v 1.1 2000/05/18 04:41:32 form Exp $
+
+--- util.c.orig	Sat May 16 14:13:12 1998
++++ util.c	Wed May 17 13:30:55 2000
+@@ -187,6 +187,13 @@
+   if (setreuid(eff_uid, real_uid) < 0)
+ 	fprintf(stderr, "minicom: cannot setreuid(%d, %d)\n", eff_uid, real_uid);
+   not_suid = 1;
++#else
++#ifdef HAS_EUID
++  if (setegid(real_gid) < 0)
++        fprintf(stderr, "minicom: cannot setegid(%d)\n", real_gid);
++  if (seteuid(real_uid) < 0)
++        fprintf(stderr, "minicom: cannot seteuid(%d)\n", real_uid);
++#endif
+ #endif
+ }
+ 
+@@ -198,6 +205,13 @@
+   if (setreuid(real_uid, eff_uid) < 0)
+ 	fprintf(stderr, "minicom: cannot setreuid(%d, %d)\n", real_uid, eff_uid);
+   not_suid = 0;
++#else
++#ifdef HAS_EUID
++  if (setegid(eff_gid) < 0)
++       fprintf(stderr, "minicom: cannot setegid(%d)\n", eff_gid);
++  if (seteuid(eff_uid) < 0)
++       fprintf(stderr, "minicom: cannot seteuid(%d)\n", eff_uid);
++#endif
+ #endif
+ }
+ 
diff --git a/comms/minicom/patches/patch-ae b/comms/minicom/patches/patch-windiv-c
similarity index 92%
rename from comms/minicom/patches/patch-ae
rename to comms/minicom/patches/patch-windiv-c
index 0a4f6e12846..7870d9b31dc 100644
--- a/comms/minicom/patches/patch-ae
+++ b/comms/minicom/patches/patch-windiv-c
@@ -1,3 +1,5 @@
+# $OpenBSD: patch-windiv-c,v 1.1 2000/05/18 04:41:32 form Exp $
+
 --- windiv.c.orig	Mon Mar  2 14:28:51 1998
 +++ windiv.c	Tue Aug 11 02:48:32 1998
 @@ -12,6 +12,7 @@
diff --git a/comms/minicom/patches/patch-ac b/comms/minicom/patches/patch-window-c
similarity index 78%
rename from comms/minicom/patches/patch-ac
rename to comms/minicom/patches/patch-window-c
index 9804c1f66c8..847b97ec1d3 100644
--- a/comms/minicom/patches/patch-ac
+++ b/comms/minicom/patches/patch-window-c
@@ -1,3 +1,5 @@
+# $OpenBSD: patch-window-c,v 1.1 2000/05/18 04:41:32 form Exp $
+
 --- window.c.orig	Tue Aug 11 03:10:29 1998
 +++ window.c	Tue Aug 11 03:07:12 1998
 @@ -104,7 +104,7 @@
diff --git a/comms/minicom/pkg/DEINSTALL b/comms/minicom/pkg/DEINSTALL
new file mode 100644
index 00000000000..8338200a1e9
--- /dev/null
+++ b/comms/minicom/pkg/DEINSTALL
@@ -0,0 +1,24 @@
+# $OpenBSD: DEINSTALL,v 1.1 2000/05/18 04:41:32 form Exp $
+#
+# joe de-installation
+
+set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/local}
+CONFIG_DIR=/etc/minicom
+
+if [ -d ${CONFIG_DIR} ]; then
+	echo
+	echo "+---------------"
+	echo "| To completely deinstall the $1 package you need to perform"
+	echo "| this step as root:"
+	echo "|"
+	echo "|           rm -rf ${CONFIG_DIR}"
+	echo "|"
+	echo "| Do not do this if you plan on re-installing $1"
+	echo "| at some future time."
+	echo "+---------------"
+	echo
+fi
+
+exit 0
diff --git a/comms/minicom/pkg/INSTALL b/comms/minicom/pkg/INSTALL
new file mode 100644
index 00000000000..2c703285f84
--- /dev/null
+++ b/comms/minicom/pkg/INSTALL
@@ -0,0 +1,69 @@
+#!/bin/sh
+# $OpenBSD: INSTALL,v 1.1 2000/05/18 04:41:32 form Exp $
+#
+# Pre/post-installation setup of minicom
+
+# exit on errors, use a sane path and install prefix
+#
+set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/local}
+CONFIG_DIR=/etc/minicom
+SAMPLE_CONFIG_DIR=${PREFIX}/share/minicom
+
+# Function: tell the user what s/he needs to do to use the port just installed
+#
+do_notice()
+{
+	echo
+	echo "+---------------"
+	echo "| The existing $1 configuration files in ${CONFIG_DIR},"
+	echo "| have NOT been changed. You may want to compare them to the"
+	echo "| current sample files in ${SAMPLE_CONFIG_DIR},"
+	echo "| and update your configuration as needed."
+	echo "+---------------"
+	echo
+}
+
+# Function: install default config files from the samples
+#
+do_install()
+{
+	install -o uucp -g dialer -m 755 -d ${CONFIG_DIR}
+	install -o root -g wheel -m 644 ${SAMPLE_CONFIG_DIR}/* ${CONFIG_DIR}
+	echo
+	echo "+---------------"
+	echo "| The $1 configuration files have been installed into"
+	echo "| $CONFIG_DIR}. Please view these files and change"
+	echo "| the configuration to meet your needs."
+	echo "+---------------"
+	echo
+}
+
+# verify proper execution
+#
+if [ $# -ne 2 ]; then
+	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+	exit 1
+fi
+
+# Verify/process the command
+#
+case $2 in
+	PRE-INSTALL)
+		: nothing to pre-install for this port
+		;;
+	POST-INSTALL)
+		if [ -d ${CONFIG_DIR} ]; then
+			do_notice $1
+		else
+			do_install $1
+		fi
+		;;
+	*)
+		echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+		exit 1
+		;;
+esac
+
+exit 0
diff --git a/comms/minicom/pkg/PLIST b/comms/minicom/pkg/PLIST
index 5b3a7685d71..bbc23c54ae8 100644
--- a/comms/minicom/pkg/PLIST
+++ b/comms/minicom/pkg/PLIST
@@ -1,24 +1,34 @@
+@comment $OpenBSD: PLIST,v 1.6 2000/05/18 04:41:32 form Exp $
+bin/ascii-xfr
+@owner uucp
+@group dialer
+@mode 6555
 bin/minicom
+@owner
+@group
+@mode
 bin/runscript
 bin/xminicom
-bin/ascii-xfr
+man/man1/ascii-xfr.1
 man/man1/minicom.1
 man/man1/runscript.1
-man/man1/ascii-xfr.1
+share/doc/minicom/demos/htsalogin
+share/doc/minicom/demos/saralogin
+share/doc/minicom/demos/scriptdemo
+share/doc/minicom/demos/unixlogin
+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_JP.sjis/LC_MESSAGES/minicom.mo
+share/locale/ja_JP.ujis/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/minicom/minicom.users
-share/minicom/demos/htsalogin
-share/minicom/demos/saralogin
-share/minicom/demos/unixlogin
-share/minicom/demos/scriptdemo
-share/minicom/tables/mc.pc8
-share/minicom/tables/mc.sf7
-share/minicom/tables/mc.iso
-share/minicom/tables/mc.noconv
-@dirrm share/minicom/tables
-@dirrm share/minicom/demos
 @dirrm share/minicom
-@unexec echo "***"
-@unexec echo "*** Finished uninstalling minicom."
-@unexec echo "*** Please remove /etc/minicom directory if you"
-@unexec echo "*** don't want to keep minicom configuration files."
-@unexec echo "***"
+@dirrm share/doc/minicom/tables
+@dirrm share/doc/minicom/demos
+@dirrm share/doc/minicom