7 files changed, 82 insertions, 82 deletions

diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index b84a9daad061..b541d219d2f5 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -8,11 +8,12 @@
 #
 
 DISTNAME=	${PKGNAME}.src
-PKGNAME=	minicom-1.80
+PKGNAME=	minicom-1.82
 CATEGORIES=	comms
-MASTER_SITES=	ftp://ftp.cistron.nl/pub/people/miquels/software/OLD/ \
-		ftp://ftp.nstu.ru/pub/sources/nettools/modem/ \
-		ftp://ftp.okbmei.msk.su/pub/comm/minicom/
+MASTER_SITES=	ftp://ftp.cistron.nl/pub/people/miquels/software/  \
+		${MASTER_SITE_SUNSITE}  \
+		http://www.clinet.fi/~walker/
+MASTER_SITE_SUBDIR=	apps/serialcomm/dialout
 
 MAINTAINER=     obrien@FreeBSD.org
 
diff --git a/comms/minicom/distinfo b/comms/minicom/distinfo
index 92832a79689e..d042287f558e 100644
--- a/comms/minicom/distinfo
+++ b/comms/minicom/distinfo
@@ -1 +1 @@
-MD5 (minicom-1.80.src.tar.gz) = 8ef2585d2e71960bd62bd6b5d6a8ce66
+MD5 (minicom-1.82.src.tar.gz) = c7720f3d8e5a32459a171971fd1bb80c
diff --git a/comms/minicom/files/patch-aa b/comms/minicom/files/patch-aa
index 6dbf14e1df81..75578ad911d0 100644
--- a/comms/minicom/files/patch-aa
+++ b/comms/minicom/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.orig	Tue Mar 10 12:15:11 1998
-+++ Makefile	Tue Aug 11 02:51:32 1998
-@@ -13,10 +13,10 @@
+--- Makefile.orig	Sat Jul 25 12:05:46 1998
++++ Makefile	Sun Dec 13 18:37:58 1998
+@@ -22,10 +22,10 @@
  #
  
  # Where to install things for Linux sites (FSSTND)
@@ -15,82 +15,80 @@
  
  # fmg 8/22/97: seems a more logical place for this :-)
  # Select Compile Options you want:
-@@ -29,14 +29,14 @@
- # -D_SEARCH_HISTORY	- Support searching of History buffer
- #                         For documentation, see file "../doc/HistSearch"
+@@ -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_
++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
++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
++DOCDIR = $(PREFIX)/etc/minicom
++MANDIR = $(PREFIX)/man/man1
  
  # Where to install things for "normal" sites.
  # BINDIR	= /usr/local/bin
-@@ -45,19 +45,19 @@
+@@ -60,19 +60,19 @@
  # 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
-+#FLAGS	= -Wall -D_POSIX -D_SYSV -D_SELECT -pipe # -I/usr/include/ncurses
- #PROGS	= minicom runscript ascii-xfr
- #LFLAGS	= -s
--#LIBS	= -ltermcap
-+#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 -D_HAVE_MACROS
-+PROGS	= minicom runscript ascii-xfr
-+LFLAGS	= -s
+ PROGS	= minicom runscript ascii-xfr
+ LFLAGS	= -s
+-LIBS	= -lncurses #-lintl
 +LIBS	= -ltermcap -lcurses
-+CC	= cc
-+
+ 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
-@@ -165,13 +165,13 @@
- 
- R	= $(ROOTDIR)
- 
--all:		$(PROGS) po
-+all:		$(PROGS) # po
- 
- minicom:	$(MOBJS)
+@@ -188,7 +188,7 @@
  		$(CC) $(LFLAGS) -o minicom $(MOBJS) $(LIBS)
  
  po: dummy
 -		make -C po
-+		$(MAKE) -C po
++		## cd po ; $(MAKE)
  
  keyserv:	$(KOBJS)
  		$(CC) -o keyserv $(LFLAGS) $(KOBJS) $(LIBS)
-@@ -223,11 +223,11 @@
+@@ -241,12 +241,12 @@
+ 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)
--		make -C po install
-+		# $(MAKE) -C po install
  
  clobber:
  		rm -f *.o *~ minicom keyserv runscript ascii-xfr
 -		make -C po clean
-+		# $(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
index 926b28821ce8..f987bdf6d9af 100644
--- a/comms/minicom/files/patch-ab
+++ b/comms/minicom/files/patch-ab
@@ -1,6 +1,6 @@
---- install.sh.orig	Sun Feb 22 14:59:37 1998
-+++ install.sh	Tue Aug 11 02:57:05 1998
-@@ -29,6 +29,7 @@
+--- 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
@@ -8,7 +8,7 @@
  
  if test ! -d $2
  then
-@@ -46,8 +47,8 @@
+@@ -41,8 +42,8 @@
  then
  	echo "Installing minicom in $2"
  	cp minicom $2/minicom
@@ -19,63 +19,59 @@
  	chmod 755 $2/minicom
  fi
  
-@@ -59,7 +60,7 @@
+@@ -54,7 +55,7 @@
  	cp $i $2/$i
  	chmod 755 $2/$i
  	chown root $2/$i
 -	chgrp root $2/$i
-+	chgrp bin $2/$i
++	chgrp wheel $2/$i
    fi
  done
  
-@@ -69,7 +70,7 @@
+@@ -64,7 +65,7 @@
  	cp keyserv $1/keyserv
  	chmod 755 $1/keyserv
  	chown root $1/keyserv
 -	chgrp root $1/keyserv
-+	chgrp bin $1/keyserv
++	chgrp wheel $1/keyserv
  fi
  
  echo "Installing manpages in $3"
-@@ -78,7 +79,7 @@
+@@ -73,7 +74,7 @@
  	cp ../man/$i $3
  	chmod 644 $3/$i
  	chown root $3/$i
 -	chgrp root $3/$i
-+	chgrp bin $3/$i
++	chgrp wheel $3/$i
  done
  
  if [ ! -f $1/minicom.users ]
-@@ -86,7 +87,7 @@
+@@ -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 bin $1/minicom.users
++	chgrp wheel $1/minicom.users
  	chmod 644 $1/minicom.users
  fi
  
-@@ -95,13 +96,13 @@
+@@ -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 644 $4/* $4/demos/* $4/tables/*
--		chmod a+x $4/demos $4/tables
--		chown root $4/* $4/demos/* $4/tables/*
--		chgrp root $4/* $4/demos/* $4/tables/*
-+		##cp -r ../tables $4
-+		chmod 644 $4/* $4/demos/* ## $4/tables/*
-+		chmod a+x $4/demos ## $4/tables
-+		chown root $4/* $4/demos/* ## $4/tables/*
-+		chgrp bin $4/* $4/demos/* ## $4/tables/*
+ 		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
-@@ -111,11 +112,12 @@
+@@ -106,11 +107,12 @@
      rm minicom.o
  fi
  	
diff --git a/comms/minicom/files/patch-ac b/comms/minicom/files/patch-ac
index e6ebf094b913..30504065e1ea 100644
--- a/comms/minicom/files/patch-ac
+++ b/comms/minicom/files/patch-ac
@@ -1,11 +1,11 @@
---- updown.c.orig	Sat Feb 28 14:58:00 1998
-+++ updown.c	Tue May 12 18:12:37 1998
-@@ -209,7 +209,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 */
  
    if (P_PFULL(g) == 'N') {
--	win = wopen(10, 7, 70, 13, BSINGLE, stdattr, mfcolor, mbcolor, 1, 0, 1);
-+	win = wopen(5, 5, 74, 11, BSINGLE, stdattr, mfcolor, mbcolor, 1, 0, 1);
- 	sprintf(title, _("%.30s %s - Press CTRL-C to quit"), P_PNAME(g),
- 		what == 'U' ? _("upload") : _("download"));
- 	wtitle(win, TMID, title);
+-    win = wopen(10, 7, 70, 13, BSINGLE, stdattr, mfcolor, mbcolor, 1, 0, 1);
++    win = wopen(5, 5, 74, 11, BSINGLE, stdattr, mfcolor, mbcolor, 1, 0, 1);
+     snprintf(title, sizeof(title), _("%.30s %s - Press CTRL-C to quit"), P_PNAME(g),
+ 	    what == 'U' ? _("upload") : _("download"));
+     wtitle(win, TMID, title);
diff --git a/comms/minicom/pkg-plist b/comms/minicom/pkg-plist
index 07ef7dd110e6..2720b54bff89 100644
--- a/comms/minicom/pkg-plist
+++ b/comms/minicom/pkg-plist
@@ -1,12 +1,17 @@
-@comment $Id: PLIST,v 1.4 1998/08/11 10:29:56 obrien Exp $
+@comment $Id: PLIST,v 1.5 1998/08/17 08:23:05 hoek Exp $
 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
diff --git a/comms/minicom/scripts/create-dev-link b/comms/minicom/scripts/create-dev-link
index 5d0699720797..6c1d44d467ab 100644
--- a/comms/minicom/scripts/create-dev-link
+++ b/comms/minicom/scripts/create-dev-link
@@ -26,7 +26,7 @@ echo -n "Lets see if you have too..."
 
 # might want to test for ``-h'' rather than ``-e''
 if [ -e /dev/modem ]; then
-	echo "  Good you do:"
+	echo "  Good you have:"
 	/bin/ls -l /dev/modem
 else
 	echo "Nope, you haven't (yet)."