diff options
author | obrien <obrien@FreeBSD.org> | 1998-08-11 18:29:56 +0800 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 1998-08-11 18:29:56 +0800 |
commit | e08c5d07b21b4f0ec6d3901c607d14375b115d12 (patch) | |
tree | 8f9b30dbc73c13a25133f18575b93abf9159eebb /comms | |
parent | 73758aaa6eedbaebd98252a2e27406ceb0fd0a06 (diff) | |
download | freebsd-ports-gnome-e08c5d07b21b4f0ec6d3901c607d14375b115d12.tar.gz freebsd-ports-gnome-e08c5d07b21b4f0ec6d3901c607d14375b115d12.tar.zst freebsd-ports-gnome-e08c5d07b21b4f0ec6d3901c607d14375b115d12.zip |
Upgrade to version 1.80.
Diffstat (limited to 'comms')
-rw-r--r-- | comms/minicom/Makefile | 5 | ||||
-rw-r--r-- | comms/minicom/distinfo | 2 | ||||
-rw-r--r-- | comms/minicom/files/patch-aa | 84 | ||||
-rw-r--r-- | comms/minicom/files/patch-ab | 43 | ||||
-rw-r--r-- | comms/minicom/files/patch-ac | 12 | ||||
-rw-r--r-- | comms/minicom/files/patch-af | 11 | ||||
-rw-r--r-- | comms/minicom/files/patch-ag | 26 | ||||
-rw-r--r-- | comms/minicom/files/patch-ai | 11 | ||||
-rw-r--r-- | comms/minicom/pkg-plist | 12 |
9 files changed, 155 insertions, 51 deletions
diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile index fe38c5a2b44d..25aa47c29256 100644 --- a/comms/minicom/Makefile +++ b/comms/minicom/Makefile @@ -4,11 +4,11 @@ # Date created: Fri Dec 01, 1995 # Whom: obrien@cs.ucdavis.edu # -# $Id: Makefile,v 1.12 1997/11/26 23:20:45 jseger Exp $ +# $Id: Makefile,v 1.13 1998/01/03 10:58:40 obrien Exp $ # DISTNAME= ${PKGNAME}.src -PKGNAME= minicom-1.78 +PKGNAME= minicom-1.80 CATEGORIES= comms MASTER_SITES= ftp://ftp.cistron.nl/pub/people/miquels/software/ @@ -19,6 +19,7 @@ RUN_DEPENDS= lrz:${PORTSDIR}/comms/lrzsz \ kermit:${PORTSDIR}/comms/kermit WRKSRC= ${WRKDIR}/${PKGNAME}/src +#USE_GMAKE= "for ``po'' dir stuff" MAN1= minicom.1 runscript.1 ascii-xfr.1 .if !defined(BATCH) diff --git a/comms/minicom/distinfo b/comms/minicom/distinfo index ebafc8c50e5b..92832a79689e 100644 --- a/comms/minicom/distinfo +++ b/comms/minicom/distinfo @@ -1 +1 @@ -MD5 (minicom-1.78.src.tar.gz) = ba4597cf787e35800206167c99bb50df +MD5 (minicom-1.80.src.tar.gz) = 8ef2585d2e71960bd62bd6b5d6a8ce66 diff --git a/comms/minicom/files/patch-aa b/comms/minicom/files/patch-aa index c73c1e7eb178..6dbf14e1df81 100644 --- a/comms/minicom/files/patch-aa +++ b/comms/minicom/files/patch-aa @@ -1,56 +1,96 @@ ---- Makefile.orig Sun Apr 28 07:16:29 1996 -+++ Makefile Sat Jan 3 02:45:02 1998 -@@ -12,17 +12,17 @@ +--- Makefile.orig Tue Mar 10 12:15:11 1998 ++++ Makefile Tue Aug 11 02:51:32 1998 +@@ -13,10 +13,10 @@ # # Where to install things for Linux sites (FSSTND) -BINDIR = /usr/bin -LIBDIR = /etc --DOCDIR = /usr/doc/examples/minicom +-DOCDIR = /usr/doc/minicom -MANDIR = /usr/man/man1 +# BINDIR = /usr/bin +# LIBDIR = /etc -+# DOCDIR = /usr/doc/examples/minicom ++# DOCDIR = /usr/doc/minicom +# MANDIR = /usr/man/man1 + # 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" + # +-OPFLAGS = -D_HISTORY -D_HAVE_MACROS -D_SEARCH_HISTORY -D_I18N_ ++OPFLAGS = -D_HISTORY -D_HAVE_MACROS -D_SEARCH_HISTORY # -D_I18N_ + # 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 -@@ -38,18 +38,18 @@ - #CC = cc +@@ -45,19 +45,19 @@ + # MANDIR = /usr/local/man/man1 - # Take these compilation flags for Linux with ncurses. --FLAGS = -Wall -D_POSIX -D_SYSV -D_SELECT -D_HAVE_MACROS # -I/usr/include/ncurses + # 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 +-LIBS = -lncurses -lintl -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 +-#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 ++#LIBS = -lncurses -lintl #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_BSD43 -D_SELECT -D_DCDFLOW -D_HAVE_MACROS +PROGS = minicom runscript ascii-xfr +LFLAGS = -s -+LIBS = -ltermcap ++LIBS = -ltermcap -lcurses +CC = cc - ++ # Take these flags for SCO unix. - #FLAGS = -D_SYSV -D_SCO -D_POSIX -D_SELECT -D_HAVE_MACROS + #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) + $(CC) $(LFLAGS) -o minicom $(MOBJS) $(LIBS) + + po: dummy +- make -C po ++ $(MAKE) -C po + + keyserv: $(KOBJS) + $(CC) -o keyserv $(LFLAGS) $(KOBJS) $(LIBS) +@@ -223,11 +223,11 @@ + + install: $(PROGS) + 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 + + clean: + rm -f *.o diff --git a/comms/minicom/files/patch-ab b/comms/minicom/files/patch-ab index 1fa580ff0ae3..926b28821ce8 100644 --- a/comms/minicom/files/patch-ab +++ b/comms/minicom/files/patch-ab @@ -1,5 +1,5 @@ ---- install.sh.orig Sat Sep 27 10:21:12 1997 -+++ install.sh Sat Jan 10 01:16:04 1998 +--- install.sh.orig Sun Feb 22 14:59:37 1998 ++++ install.sh Tue Aug 11 02:57:05 1998 @@ -29,6 +29,7 @@ exit 1 fi @@ -8,17 +8,17 @@ if test ! -d $2 then -@@ -47,8 +48,8 @@ +@@ -46,8 +47,8 @@ + then echo "Installing minicom in $2" cp minicom $2/minicom - chmod 755 $2/minicom - chown root $2/minicom -- chgrp root $2/minicom +- chgrp uucp $2/minicom + chown uucp $2/minicom + chgrp dialer $2/minicom + chmod 755 $2/minicom fi - for i in runscript xminicom ascii-xfr @@ -59,7 +60,7 @@ cp $i $2/$i chmod 755 $2/$i @@ -55,16 +55,27 @@ chmod 644 $1/minicom.users fi -@@ -98,7 +99,7 @@ - cp ../demos/$i $4/$i - chmod 644 $4/$i - chown root $4/$i -- chgrp root $4/$i -+ chgrp bin $4/$i - done +@@ -95,13 +96,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/* else echo "You don't have a $4 directory - script examples not installed." -@@ -109,9 +110,10 @@ + fi +@@ -111,11 +112,12 @@ rm minicom.o fi @@ -72,10 +83,14 @@ -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 bd14ef0a9671..e6ebf094b913 100644 --- a/comms/minicom/files/patch-ac +++ b/comms/minicom/files/patch-ac @@ -1,11 +1,11 @@ ---- updown.c.orig Sun Oct 13 13:56:18 1996 -+++ updown.c Sun Oct 13 13:58:54 1996 -@@ -150,7 +150,7 @@ - sprintf(cmdline, "%s %s", P_PPROG(g), s); +--- updown.c.orig Sat Feb 28 14:58:00 1998 ++++ updown.c Tue May 12 18:12:37 1998 +@@ -209,7 +209,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"); + sprintf(title, _("%.30s %s - Press CTRL-C to quit"), P_PNAME(g), + what == 'U' ? _("upload") : _("download")); wtitle(win, TMID, title); diff --git a/comms/minicom/files/patch-af b/comms/minicom/files/patch-af new file mode 100644 index 000000000000..9804c1f66c8c --- /dev/null +++ b/comms/minicom/files/patch-af @@ -0,0 +1,11 @@ +--- window.c.orig Tue Aug 11 03:10:29 1998 ++++ window.c Tue Aug 11 03:07:12 1998 +@@ -104,7 +104,7 @@ + + int useattr = 1; + int dirflush = 1; +-extern int LINES, COLS; ++int LINES, COLS; + int usecolor = 0; + WIN *stdwin; + char *_tptr = CNULL; diff --git a/comms/minicom/files/patch-ag b/comms/minicom/files/patch-ag new file mode 100644 index 000000000000..0a4f6e128464 --- /dev/null +++ b/comms/minicom/files/patch-ag @@ -0,0 +1,26 @@ +--- 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 + */ ++#include <sys/types.h> + #include <dirent.h> + #include <sys/stat.h> + #include "port.h" +@@ -244,8 +245,14 @@ + + /* get regular files */ + dirlist[nCnt].d_ino = dirent->d_ino; +- dirlist[nCnt].d_off = dirent->d_off; + dirlist[nCnt].d_reclen = dirent->d_reclen; ++#if (defined(BSD) && (BSD >= 199306)) ++ dirlist[nCnt].d_type = dirent->d_type; ++ dirlist[nCnt].d_namlen = dirent->d_namlen; ++#else ++ dirlist[nCnt].d_off = dirent->d_off; ++#endif ++ + strcpy(dirlist[nCnt].d_name, dirent->d_name ); + nMaxWidth = max(nMaxWidth, strlen(dirent->d_name)); + nCnt++; diff --git a/comms/minicom/files/patch-ai b/comms/minicom/files/patch-ai new file mode 100644 index 000000000000..8be58f97aaf2 --- /dev/null +++ b/comms/minicom/files/patch-ai @@ -0,0 +1,11 @@ +--- config.h.orig Fri Oct 31 11:48:00 1997 ++++ config.h Tue Aug 11 02:44:53 1998 +@@ -58,7 +58,7 @@ + + #ifdef __FreeBSD__ + # define DFL_PORT "/dev/modem" +-# define DEF_BAUD "19200" ++# define DEF_BAUD "38400" + # define CALLOUT "" + # define CALLIN "" + #endif diff --git a/comms/minicom/pkg-plist b/comms/minicom/pkg-plist index c99d4b02e68d..0559807ccd74 100644 --- a/comms/minicom/pkg-plist +++ b/comms/minicom/pkg-plist @@ -1,15 +1,15 @@ +@comment $Id$ bin/minicom bin/xminicom bin/runscript bin/ascii-xfr etc/minicom/minicom.users -etc/minicom/htsalogin -etc/minicom/saralogin -etc/minicom/scriptdemo -etc/minicom/unixlogin +etc/minicom/demos/htsalogin +etc/minicom/demos/saralogin +etc/minicom/demos/scriptdemo +etc/minicom/demos/unixlogin man/man1/minicom.1.gz man/man1/runscript.1.gz man/man1/ascii-xfr.1.gz @exec /usr/sbin/chown uucp %D/etc/minicom -@unexec /bin/rm -rf %D/etc/minicom/* -@dirrm etc/minicom +@dirrm etc/minicom/demos |