Upgrade to 1.75, also build package with a default port if BATCH is set.

Submitted by:	"David E. O'Brien" <obrien@Nuxi.cs.ucdavis.edu>

5 files changed, 60 insertions, 71 deletions

diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index 30d951783f9e..a5dbc6c4467a 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -3,32 +3,32 @@
 # Date created:         Fri Dec 01, 1995
 # Whom:                 obrien@cs.ucdavis.edu
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/03/05 07:46:57 asami Exp $
 #
 
-DISTNAME=	minicom-1.74
+DISTNAME=	minicom-1.75
 CATEGORIES+=	comms
 MASTER_SITES=	ftp://sunsite.unc.edu/pub/Linux/apps/comm/ \
 		ftp://ftp.yggdrasil.com/mirrors/sunsite/apps/comm/
 
 MAINTAINER=     obrien@cs.ucdavis.edu
 
-EXEC_DEPENDS=	rz:${PORTSDIR}/comms/rzsz \
+RUN_DEPENDS=	rz:${PORTSDIR}/comms/rzsz \
 		sz:${PORTSDIR}/comms/rzsz \
 		kermit:${PORTSDIR}/comms/kermit
 
 WRKSRC=		${WRKDIR}/${PKGNAME}/src
-IS_INTERACTIVE= yes
-NO_PACKAGE=	yes	# modem port etc. built in
 
-# I believe I prefer to do this in Minicom's Makefile so as to use its macros
+.if !defined(BATCH)
 pre-install:
-#	[ -d ${PREFIX}/etc/minicom ] || /bin/mkdir -p ${PREFIX}/etc/minicom
+	# this script creates a link from your comm port to /dev/modem
+	/bin/sh ${SCRIPTDIR}/create-dev-link
+.endif
 
 post-install:
 .if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/minicom.1
-	gzip -9nf ${PREFIX}/man/man1/runscript.1
+	@for mp in minicom.1 runscript.1 ascii-xfr.1 ; do \
+		gzip -9nf ${PREFIX}/man/man1/$$mp ; done
 .endif
 
 .include <bsd.port.mk>
diff --git a/comms/minicom/distinfo b/comms/minicom/distinfo
index c29d23458140..610fa2240206 100644
--- a/comms/minicom/distinfo
+++ b/comms/minicom/distinfo
@@ -1 +1 @@
-MD5 (minicom-1.74.tar.gz) = 669c8ff5ace2a401caf297e29de5bb5b
+MD5 (minicom-1.75.tar.gz) = 4a70cb1dc3a758b807fce4fcbc41276f
diff --git a/comms/minicom/files/patch-aa b/comms/minicom/files/patch-aa
index 078954b213c0..d6179748ccc4 100644
--- a/comms/minicom/files/patch-aa
+++ b/comms/minicom/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.orig	Thu Jan 18 14:32:00 1996
-+++ Makefile	Mon Mar  4 23:36:34 1996
-@@ -12,10 +12,17 @@
+--- Makefile.orig	Sun Apr 28 07:16:29 1996
++++ Makefile	Tue Jul  9 00:18:00 1996
+@@ -12,17 +12,17 @@
  #
  
  # Where to install things for Linux sites (FSSTND)
@@ -8,63 +8,50 @@
 -LIBDIR	= /etc
 -DOCDIR	= /usr/doc/examples/minicom
 -MANDIR	= /usr/man/man1
-+#BINDIR	= /usr/bin
-+#LIBDIR	= /etc
-+#DOCDIR	= /usr/doc/examples/minicom
-+#MANDIR	= /usr/man/man1
-+
-+# 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
++###BINDIR	= /usr/bin
++###LIBDIR	= /etc
++###DOCDIR	= /usr/doc/examples/minicom
++###MANDIR	= /usr/man/man1
+ 
+ # 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
++BINDIR = $(PREFIX)/bin
++LIBDIR = $(PREFIX)/etc/minicom
++##DOCDIR = $(PREFIX)/share/minicom
++DOCDIR = $(PREFIX)/etc/minicom
++MANDIR = $(PREFIX)/man/man1
  
  # Where to install things for "normal" sites.
  # BINDIR	= /usr/local/bin
-@@ -31,19 +38,19 @@
+@@ -38,18 +38,18 @@
  #CC	= cc
  
  # Take these compilation flags for Linux with ncurses.
 -FLAGS	= -Wall -D_POSIX -D_SYSV -D_SELECT -D_HAVE_MACROS # -I/usr/include/ncurses
--PROGS	= minicom runscript
--LFLAGS	= -s
++###FLAGS	= -Wall -D_POSIX -D_SYSV -D_SELECT -D_HAVE_MACROS # -I/usr/include/ncurses
++###PROGS	= minicom runscript ascii-xfr
++###LFLAGS	= -s
++###LIBS	= -lncurses
++###CC	= cc
++
++# Take these compilation flags for FreeBSD.
++FLAGS	= -Wall -D_POSIX -D_BSD43 -D_SELECT -D_HAVE_MACROS -D_DCDFLOW
+ PROGS	= minicom runscript ascii-xfr
+ LFLAGS	= -s
 -LIBS	= -lncurses
--CC	= cc
++LIBS	= -ltermcap
+ CC	= cc
 -
 -# Take these compilation flags for FreeBSD.
 -#FLAGS	= -Wall -D_POSIX -D_BSD43 -D_SELECT -D_HAVE_MACROS -D_DCDFLOW
-+#FLAGS	= -Wall -D_POSIX -D_SYSV -D_SELECT -D_HAVE_MACROS # -I/usr/include/ncurses
- #PROGS	= minicom runscript
- #LFLAGS	= -s
+-#PROGS	= minicom runscript ascii-xfr
+-#LFLAGS	= -s
 -#LIBS	= -ltermcap
-+#LIBS	= -lncurses
- #CC	= cc
+-#CC	= cc
  
-+# Take these compilation flags for FreeBSD.
-+FLAGS	= -Wall -D_POSIX -D_BSD43 -D_SELECT -D_HAVE_MACROS -D_DCDFLOW
-+PROGS	= minicom runscript
-+LFLAGS	= -s
-+LIBS	= -ltermcap
-+CC	= cc
-+
  # Take these flags for SCO unix.
  #FLAGS	= -D_SYSV -D_SCO -D_POSIX -D_SELECT -D_HAVE_MACROS
- #PROGS	= minicom runscript
-@@ -146,7 +153,7 @@
- 
- SOBJS	= script.o sysdep1.o
- 
--CFLAGS	= $(FLAGS) -DLIBDIR=\"$(LIBDIR)\"
-+CFLAGS	+= $(FLAGS) -DLIBDIR=\"$(LIBDIR)\"
- 
- R	= $(ROOTDIR)
- 
-@@ -197,6 +204,7 @@
- rwconf.o:	rwconf.c $(HDRS)
- 
- install:	$(PROGS)
-+	#	-/bin/mkdir -p $(R)$(BINDIR) $(R)$(LIBDIR) $(R)$(MANDIR) $(R)$(DOCDIR)
- 		sh install.sh $(R)$(LIBDIR) $(R)$(BINDIR) $(R)$(MANDIR) $(R)$(DOCDIR)
- 
- clobber:
diff --git a/comms/minicom/files/patch-ab b/comms/minicom/files/patch-ab
index d903971552de..0df437aa8094 100644
--- a/comms/minicom/files/patch-ab
+++ b/comms/minicom/files/patch-ab
@@ -1,20 +1,20 @@
---- install.sh.orig	Thu Jan 18 20:45:40 1996
-+++ install.sh	Sat Jan 27 02:07:26 1996
+--- install.sh.orig	Sun Mar 10 07:32:20 1996
++++ install.sh	Tue Jul  9 00:31:57 1996
 @@ -48,7 +48,7 @@
  	cp minicom $2/minicom
  	chmod 755 $2/minicom
  	chown root $2/minicom
 -	chgrp root $2/minicom
-+	chgrp bin $2/minicom
++	chgrp dialer $2/minicom
  fi
  
- for i in runscript xminicom
+ for i in runscript xminicom ascii-xfr
 @@ -59,7 +59,7 @@
  	cp $i $2/$i
  	chmod 755 $2/$i
  	chown root $2/$i
 -	chgrp root $2/$i
-+	chgrp bin $2/$i
++	chgrp dialer $2/$i
    fi
  done
  
@@ -45,7 +45,7 @@
  	chmod 644 $1/minicom.users
  fi
  
-@@ -98,15 +98,18 @@
+@@ -98,15 +98,16 @@
  		cp ../demos/$i $4/$i
  		chmod 644 $4/$i
  		chown root $4/$i
@@ -57,13 +57,13 @@
  fi
  	
 -echo "Minicom is NOT setuid yet - you must do this yourself by entering:"
-+#echo "Minicom is NOT setuid yet - you must do this yourself by entering:"
- echo
+-echo
 -echo "chmod +s $2/minicom"
-+#echo "chmod +s $2/minicom"
-+echo "chmod 4511 $2/minicom"
- echo
-+
-+	chmod 4511 $2/minicom
+-echo
++###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
  
  exit 0
diff --git a/comms/minicom/pkg-plist b/comms/minicom/pkg-plist
index e6ae85577972..1b8ef5a7d4e2 100644
--- a/comms/minicom/pkg-plist
+++ b/comms/minicom/pkg-plist
@@ -1,6 +1,7 @@
 bin/minicom
 bin/xminicom
 bin/runscript
+bin/ascii-xfr
 etc/minicom/minicom.users
 etc/minicom/htsalogin
 etc/minicom/saralogin
@@ -8,3 +9,4 @@ etc/minicom/scriptdemo
 etc/minicom/unixlogin     
 man/man1/minicom.1.gz
 man/man1/runscript.1.gz
+man/man1/ascii-xfr.1.gz