summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>1999-04-14 21:13:24 +0000
committertron <tron@pkgsrc.org>1999-04-14 21:13:24 +0000
commitc4fbeaf9dc03621169f94a2aeab07ede7aed47c1 (patch)
tree4ec181b5ee2ec5859c4101f4ee4a65a647a82881
parent958c6e540d75eafdce3b2c3cc3b583243183da27 (diff)
downloadpkgsrc-c4fbeaf9dc03621169f94a2aeab07ede7aed47c1.tar.gz
Update "minicom" package to version 1.82.1.
-rw-r--r--comms/minicom/Makefile17
-rw-r--r--comms/minicom/files/md54
-rw-r--r--comms/minicom/patches/patch-aa117
-rw-r--r--comms/minicom/patches/patch-ab51
-rw-r--r--comms/minicom/patches/patch-ac20
-rw-r--r--comms/minicom/patches/patch-ae38
-rw-r--r--comms/minicom/pkg/PLIST66
7 files changed, 206 insertions, 107 deletions
diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index 508ee524543..f3270acea65 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -1,20 +1,24 @@
-# $NetBSD: Makefile,v 1.10 1998/11/19 15:40:45 agc Exp $
+# $NetBSD: Makefile,v 1.11 1999/04/14 21:13:24 tron Exp $
# FreeBSD Id: Makefile,v 1.13 1998/01/03 10:58:40 obrien Exp
#
DISTNAME= ${PKGNAME}.src
-PKGNAME= minicom-1.78
+PKGNAME= minicom-1.82.1
CATEGORIES= comms
-MASTER_SITES= ftp://ftp.cistron.nl/pub/people/miquels/software/
+MASTER_SITES= http://www.pp.clinet.fi/~walker/
MAINTAINER= tron@netbsd.org
HOMEPAGE= http://www.clinet.fi/~walker/minicom.html
-DEPENDS+= lrzsz-0.12.18:../../comms/lrzsz
+BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:../../devel/gettext
DEPENDS+= kermit-6.0.192:../../comms/kermit
+DEPENDS+= lrzsz-0.12.18:../../comms/lrzsz
+DEPENDS+= ncurses-1.9.9g:../../devel/ncurses
+
+USE_GMAKE= yes
+NO_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${PKGNAME}/src
-IS_INTERACTIVE= yes
.if !defined(BATCH)
pre-install:
@@ -22,4 +26,7 @@ pre-install:
${SH} ${SCRIPTDIR}/create-dev-link
.endif
+post-install:
+ @${CHOWN} -R uucp:dialer ${PREFIX}/etc/minicom
+
.include "../../mk/bsd.pkg.mk"
diff --git a/comms/minicom/files/md5 b/comms/minicom/files/md5
index 389551cb353..93dc03bb90c 100644
--- a/comms/minicom/files/md5
+++ b/comms/minicom/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:17:02 agc Exp $
+$NetBSD: md5,v 1.3 1999/04/14 21:13:24 tron Exp $
-MD5 (minicom-1.78.src.tar.gz) = ba4597cf787e35800206167c99bb50df
+MD5 (minicom-1.82.1.src.tar.gz) = 67cddf3fc1857608edc2513be6fc58f2
diff --git a/comms/minicom/patches/patch-aa b/comms/minicom/patches/patch-aa
index 413773cf023..acfdbee3496 100644
--- a/comms/minicom/patches/patch-aa
+++ b/comms/minicom/patches/patch-aa
@@ -1,58 +1,95 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 10:36:41 agc Exp $
+$NetBSD: patch-aa,v 1.4 1999/04/14 21:13:24 tron Exp $
---- Makefile.orig Sun Apr 28 16:16:29 1996
-+++ Makefile Wed Feb 11 22:56:40 1998
-@@ -12,17 +12,17 @@
+--- Makefile.orig Sat Jul 25 21:05:46 1998
++++ Makefile Wed Apr 14 22:34:08 1999
+@@ -22,10 +22,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
-+# MANDIR = /usr/man/man1
-
- # 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
++#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:
+@@ -53,6 +53,12 @@
+ # DOCDIR = /usr/local/etc/minicom
+ # MANDIR = /usr/local/man/man1
+
++# Where to install things for NetBSD sites.
++BINDIR = $(PREFIX)/bin
++LIBDIR = $(PREFIX)/etc/minicom
++DOCDIR = $(PREFIX)/share/doc/minicom
++MANDIR = $(PREFIX)/man/man1
++
# Where to install things for "normal" sites.
# BINDIR = /usr/local/bin
-@@ -38,18 +38,18 @@
- #CC = cc
+ # LIBDIR = /usr/local/lib
+@@ -60,11 +66,11 @@
+ # 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
- #PROGS = minicom runscript ascii-xfr
- #LFLAGS = -s
--#LIBS = -ltermcap
-+#LIBS = -lncurses
- #CC = cc
-+
-+# Take these compilation flags for FreeBSD.
-+FLAGS = -Wall -D_POSIX -D_BSD43 -D_SELECT -D_HAVE_MACROS -D_DCDFLOW -DBINDIR=\"${BINDIR}\"
++#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
+@@ -153,6 +159,14 @@
+ #PROGS = minicom runscript ascii-xfr keyserv
+ #LIBS =
+
++# Take these compilation flags for NetBSD.
++FLAGS = -Wall -D_POSIX -D_BSD43 -D_SELECT -D_DCDFLOW -I$(PREFIX)/include -DBINDIR=\"$(BINDIR)\"
+PROGS = minicom runscript ascii-xfr
+LFLAGS = -s
-+LIBS = -ltermcap
++INTL = -Wl,-R$(PREFIX)/lib -L$(PREFIX)/lib -lintl
++LIBS = $(INTL) -lncurses -ltermcap
+CC = cc
++
+ # Nothing should have to change beneath this line
+
+ SRCS = minicom.c vt100.c config.c help.c updown.c \
+@@ -188,13 +202,13 @@
+ $(CC) $(LFLAGS) -o minicom $(MOBJS) $(LIBS)
+
+ po: dummy
+- make -C po
++ ${MAKE} -C po
+
+ keyserv: $(KOBJS)
+ $(CC) -o keyserv $(LFLAGS) $(KOBJS) $(LIBS)
+
+ runscript: $(SOBJS)
+- $(CC) -o runscript $(LFLAGS) $(SOBJS)
++ $(CC) -o runscript $(LFLAGS) $(SOBJS) $(INTL)
+
+ ascii-xfr: ascii-xfr.o
+ $(CC) -s -o ascii-xfr $(LFLAGS) ascii-xfr.o
+@@ -241,12 +255,12 @@
+ dummy:
+
+ install: $(PROGS)
+- make -C po install R=$(R)
++ ${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
++ ${MAKE} -C po clean
- # Take these flags for SCO unix.
- #FLAGS = -D_SYSV -D_SCO -D_POSIX -D_SELECT -D_HAVE_MACROS
+ clean:
+ rm -f *.o
diff --git a/comms/minicom/patches/patch-ab b/comms/minicom/patches/patch-ab
index 2a7fd91b228..125bada12d7 100644
--- a/comms/minicom/patches/patch-ab
+++ b/comms/minicom/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 10:36:42 agc Exp $
+$NetBSD: patch-ab,v 1.3 1999/04/14 21:13:24 tron Exp $
---- install.sh.orig Sat Sep 27 10:21:12 1997
-+++ install.sh Sat Jan 10 01:16:04 1998
-@@ -29,6 +29,7 @@
+--- install.sh.orig Tue Apr 21 19:45:42 1998
++++ install.sh Wed Apr 14 22:04:02 1999
+@@ -24,6 +24,7 @@
exit 1
fi
fi
@@ -10,63 +10,63 @@ $NetBSD: patch-ab,v 1.2 1998/08/07 10:36:42 agc Exp $
if test ! -d $2
then
-@@ -47,8 +48,8 @@
+@@ -41,8 +42,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 @@
+@@ -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
-@@ -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
+@@ -96,7 +97,7 @@
+ 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."
-@@ -109,9 +110,10 @@
+ fi
+@@ -106,10 +107,11 @@
rm minicom.o
fi
@@ -79,5 +79,6 @@ $NetBSD: patch-ab,v 1.2 1998/08/07 10:36:42 agc Exp $
+###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-ac b/comms/minicom/patches/patch-ac
index 1fbad0f0d46..0ea75aeab6a 100644
--- a/comms/minicom/patches/patch-ac
+++ b/comms/minicom/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 10:36:42 agc Exp $
+$NetBSD: patch-ac,v 1.3 1999/04/14 21:13:24 tron Exp $
---- 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 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/patches/patch-ae b/comms/minicom/patches/patch-ae
index 37905d23557..cb437ff38f7 100644
--- a/comms/minicom/patches/patch-ae
+++ b/comms/minicom/patches/patch-ae
@@ -1,14 +1,28 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 10:36:43 agc Exp $
+$NetBSD: patch-ae,v 1.3 1999/04/14 21:13:24 tron Exp $
---- minicom.c.orig Sat Sep 27 17:03:30 1997
-+++ minicom.c Fri Jan 9 19:59:13 1998
-@@ -530,7 +530,8 @@
- /* Loop again if more options */
- } while(optind < argk);
+--- po/Makefile.orig Sun Jan 10 01:22:51 1999
++++ po/Makefile Wed Apr 14 22:57:19 1999
+@@ -1,7 +1,6 @@
+-INSTALL= /usr/bin/install -c
+-INSTALL_PROGRAM= ${INSTALL}
+-INSTALL_DATA= ${INSTALL} -m 644
+-INSTALLNLSDIR=/usr/share/locale
++INSTALL_DATA= ${BSD_INSTALL_DATA}
++INSTALL_DATA_DIR= ${BSD_INSTALL_DATA_DIR}
++INSTALLNLSDIR= ${PREFIX}/share/locale
-- if (real_uid == 0 && dosetup == 0) {
-+ /* also allow root to run minicom with `-d' switch */
-+ if (real_uid == 0 && dosetup == 0 && cmd_dial == NULL) {
- fprintf(stderr, "%s%s%s",
- "minicom: WARNING: please don't run minicom as root when not maintaining\n",
- " it (with the -s switch) since all changes to the\n",
+ MSGMERGE = msgmerge
+
+@@ -52,9 +51,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_DATA_DIR) $(R)$(INSTALLNLSDIR)/$$l; \
++ $(INSTALL_DATA_DIR) $(R)$(INSTALLNLSDIR)/$$l/LC_MESSAGES; \
++ $(INSTALL_DATA) $$n $(R)$(INSTALLNLSDIR)/$$l/LC_MESSAGES/minicom.mo; \
+ done
+
+ %.mo: %.po
diff --git a/comms/minicom/pkg/PLIST b/comms/minicom/pkg/PLIST
index b6ff4906c60..28c41657de8 100644
--- a/comms/minicom/pkg/PLIST
+++ b/comms/minicom/pkg/PLIST
@@ -1,16 +1,56 @@
-@comment $NetBSD: PLIST,v 1.3 1998/03/10 13:42:00 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.4 1999/04/14 21:13:24 tron Exp $
+bin/ascii-xfr
bin/minicom
-bin/xminicom
bin/runscript
-bin/ascii-xfr
+bin/xminicom
etc/minicom/minicom.users
-etc/minicom/htsalogin
-etc/minicom/saralogin
-etc/minicom/scriptdemo
-etc/minicom/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
+man/man1/minicom.1
+man/man1/runscript.1
+man/man1/ascii-xfr.1
+share/doc/minicom/Announce-1.78
+share/doc/minicom/Announce-1.82
+share/doc/minicom/Announce-1.82.1
+share/doc/minicom/COMPATABILITY.lrzsz
+share/doc/minicom/ChangeLog
+share/doc/minicom/HistSearch
+share/doc/minicom/Locales
+share/doc/minicom/Macros
+share/doc/minicom/Porting
+share/doc/minicom/QuickStart.modemu
+share/doc/minicom/README.lrzsz
+share/doc/minicom/RedHat
+share/doc/minicom/TODO.lrzsz
+share/doc/minicom/Todo
+share/doc/minicom/Todo.175
+share/doc/minicom/Todo.Irix.dif
+share/doc/minicom/Todo.dial.c.dif
+share/doc/minicom/Todo.emacskey.dif
+share/doc/minicom/Todo.fsel
+share/doc/minicom/Todo.i18n
+share/doc/minicom/copyright.modemu
+share/doc/minicom/demos/htsalogin
+share/doc/minicom/demos/saralogin
+share/doc/minicom/demos/scriptdemo
+share/doc/minicom/demos/unixlogin
+share/doc/minicom/developers
+share/doc/minicom/fselector.txt
+share/doc/minicom/japanese
+share/doc/minicom/minirc.dfl
+share/doc/minicom/modemu.README
+share/doc/minicom/pl-translation.txt
+share/doc/minicom/portugues-brasil
+share/doc/minicom/suomeksi
+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/fr/LC_MESSAGES/minicom.mo
+share/locale/pl/LC_MESSAGES/minicom.mo
+share/locale/pt_BR/LC_MESSAGES/minicom.mo
+share/locale/fi_FI/LC_MESSAGES/minicom.mo
+share/locale/ja_JP.ujis/LC_MESSAGES/minicom.mo
+share/locale/ja_JP.sjis/LC_MESSAGES/minicom.mo
+@dirrm share/doc/minicom/tables
+@dirrm share/doc/minicom/demos
+@dirrm share/doc/minicom
+@unexec rm -rf %D/etc/minicom