Changes 2.5: * Handle device reconnected more smoothly (USB-serial dongles) * Translation updates: Danish * Several fixes (see ChangeLog) Changes 2.4: * Add -D and -b options to specify device and baud rate on the command line. * Do character conversion between local and remote side (-R option) * Added indonesian translation * Compatibility fixes for recent build environments * Remove code that handled very old systems Changes 2.3: * Fix build on Mac OS X * New version of the dial format to be little and big endian as well as 32/64 bit safe * Support more baud rates * Handle device disappearances (e.g. serial-USB device unplug) * Various build and other fixes Changes 2.2: * Vietnamese translation added * Norwegian translation added * Traditional chinese translation added * Swedish translation added * Romanian translation added * default to 8bit mode if LANG or LC_ALL are set * default baud rate set to 115200 * Various code cleanups and fixesdiff -r1.58 -r1.59 pkgsrc/comms/minicom/Makefile
(adam)
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.58 2011/04/22 13:43:10 obache Exp $
+# $NetBSD: Makefile,v 1.59 2011/08/01 09:30:33 adam Exp $
-DISTNAME= minicom-2.1
-PKGREVISION= 4
+DISTNAME= minicom-2.5
CATEGORIES= comms
-MASTER_SITES= http://alioth.debian.org/download.php/123/
+MASTER_SITES= http://alioth.debian.org/frs/download.php/3487/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://alioth.debian.org/projects/minicom/
COMMENT= MS-DOS Telix serial communication program "workalike"
+LICENSE= gnu-gpl-v2
DEPENDS+= gkermit-[0-9]*:../../comms/gkermit
DEPENDS+= lrzsz-[0-9]*:../../comms/lrzsz
@@ -19,22 +19,18 @@
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake msgfmt
GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-
PKG_SYSCONFSUBDIR= minicom
EGDIR= ${PREFIX}/share/examples/minicom
PKG_GROUPS= ${DIALER_GROUP}
PKG_USERS= ${UUCP_USER}:${UUCP_GROUP}
-
PKG_GROUPS_VARS+= DIALER_GROUP UUCP_GROUP
-PKG_USERS_VARS+= UUCP_USER
+PKG_USERS_VARS= UUCP_USER
SPECIAL_PERMS= ${PREFIX}/bin/minicom ${UUCP_USER} ${DIALER_GROUP} 4555
OWN_DIRS_PERMS= ${PKG_SYSCONFDIR} ${UUCP_USER} ${DIALER_GROUP} 0755
-CONF_FILES_PERMS= ${EGDIR}/minicom.users ${PKG_SYSCONFDIR}/minicom.users \
- ${UUCP_USER} ${DIALER_GROUP} 0644
EVAL_PREFIX+= GKERMIT_PREFIX=gkermit
EVAL_PREFIX+= LRZSZ_PREFIX=lrzsz
@@ -45,8 +41,6 @@
SUBST_FILES.minicom= src/rwconf.c
SUBST_VARS.minicom= PREFIX GKERMIT_PREFIX LRZSZ_PREFIX
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/doc/minicom.users ${DESTDIR}${EGDIR}
-
+.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/11/16 10:39:10 obache Exp $
+@comment $NetBSD: PLIST,v 1.12 2011/08/01 09:30:33 adam Exp $
bin/ascii-xfr
bin/minicom
bin/runscript
@@ -7,13 +7,21 @@
man/man1/minicom.1
man/man1/runscript.1
man/man1/xminicom.1
-share/examples/minicom/minicom.users
share/locale/cs/LC_MESSAGES/minicom.mo
+share/locale/da/LC_MESSAGES/minicom.mo
+share/locale/de/LC_MESSAGES/minicom.mo
share/locale/es/LC_MESSAGES/minicom.mo
share/locale/fi/LC_MESSAGES/minicom.mo
share/locale/fr/LC_MESSAGES/minicom.mo
share/locale/hu/LC_MESSAGES/minicom.mo
+share/locale/id/LC_MESSAGES/minicom.mo
share/locale/ja/LC_MESSAGES/minicom.mo
+share/locale/nb/LC_MESSAGES/minicom.mo
share/locale/pl/LC_MESSAGES/minicom.mo
share/locale/pt_BR/LC_MESSAGES/minicom.mo
+share/locale/ro/LC_MESSAGES/minicom.mo
share/locale/ru/LC_MESSAGES/minicom.mo
+share/locale/rw/LC_MESSAGES/minicom.mo
+share/locale/sv/LC_MESSAGES/minicom.mo
+share/locale/vi/LC_MESSAGES/minicom.mo
+share/locale/zh_TW/LC_MESSAGES/minicom.mo
@@ -1,15 +1,12 @@
-$NetBSD: distinfo,v 1.10 2009/08/24 08:14:36 wiz Exp $
+$NetBSD: distinfo,v 1.11 2011/08/01 09:30:33 adam Exp $
-SHA1 (minicom-2.1.tar.gz) = 720273f6ee8db5fb2da4379ac610a520a31aba70
+SHA1 (minicom-2.5.tar.gz) = 442250314de63189b619f8744c0669445e2cdd1d
-RMD160 (minicom-2.1.tar.gz) = 58121cf29991a92914acee855d6e86486c6d370d
+RMD160 (minicom-2.5.tar.gz) = 4131b9ef37d25cf8f77a70fc4b4de32e7896cc23
-Size (minicom-2.1.tar.gz) = 607939 bytes
+Size (minicom-2.5.tar.gz) = 822499 bytes
-SHA1 (patch-aa) = a7c85609f9384ec7c0e5e950d6244f527b0876d1
+SHA1 (patch-aa) = 1ce591eb1f9969a8dd72194d10f69a1df77c35a7
-SHA1 (patch-ab) = 4cfb8bc389f4052c08551651aa86f98d0e751028
+SHA1 (patch-ab) = db913d60191fd1b0830746019c6cc9c125069cfb
-SHA1 (patch-ac) = 91a2acce80d7d1815a29843b1de5e1acc172024a
+SHA1 (patch-ac) = 6af60d8edb50f4cd10bc4b63a792cec2075ed6d5
-SHA1 (patch-ad) = 31e09b2df1bb93e3ccbd9f400f6fb127726f6070
+SHA1 (patch-ad) = e57999876f690689d858aa07f5c122ea79bfd2f1
-SHA1 (patch-ae) = b037623c4e3ee4cbc8c73c4b04c6b7f77c689d38
+SHA1 (patch-ae) = 1d3267fc666d857bbab05a542de6d3aa1ba53e14
-SHA1 (patch-af) = 38905432b60a796742d43be1aed84ee2774bb222
+SHA1 (patch-ag) = cf6c551736feb77f7f714cb4ba8b9a787eac937d
-SHA1 (patch-ag) = c8947fb6693d2508d7caa79916142af346e27cdd
+SHA1 (patch-ah) = dd014449e5de1ac3537d697c9e73416a64e8af3e
-SHA1 (patch-ah) = da65045ad1d02a7c005aba863a106472d05f5c1c
-SHA1 (patch-ai) = 5a1ecdea3287dc4d0b1c71bb88656fb729522081
-SHA1 (patch-aj) = 56c537b245aa32f9b71c96d527bc83c88ec66005
@@ -1,20 +1,13 @@
-$NetBSD: patch-aa,v 1.9 2005/06/19 11:34:45 veego Exp $
+$NetBSD: patch-aa,v 1.10 2011/08/01 09:30:33 adam Exp $
---- src/Makefile.am.orig 2003-04-30 00:03:22.000000000 +0200
-+++ src/Makefile.am 2005-05-17 21:55:32.000000000 +0200
-@@ -3,8 +3,6 @@
+--- src/Makefile.in.orig 2011-01-29 11:45:05.000000000 +0000
++++ src/Makefile.in
+@@ -247,7 +247,7 @@ confdir = @MINICOM_CONFDIR@
+ AM_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/lib -DCONFDIR=\"$(confdir)\" \
+ -DLOCALEDIR=\"$(datadir)/locale\"
- bin_PROGRAMS = minicom runscript ascii-xfr @KEYSERV@
+-minicom_LDADD = @LIBINTL@ $(MINICOM_LIBPORT)
-
++minicom_LDADD = @LIBINTL@ $(MINICOM_LIBPORT) $(LIBICONV)
--bin_SCRIPTS = xminicom
+ minicom_keyserv_LDADD = @LIBINTL@ $(MINICOM_LIBPORT)
--
+ runscript_LDADD = @LIBINTL@ $(MINICOM_LIBPORT)
- minicom_SOURCES = minicom.c vt100.c config.c help.c updown.c \
+ EXTRA_DIST = functions.c
- util.c dial.c window.c wkeys.c ipc.c \
- windiv.c sysdep1.c sysdep1_s.c sysdep2.c rwconf.c main.c \
-@@ -34,5 +32,5 @@
-
- runscript_LDADD = @INTLLIBS@
-
--EXTRA_DIST = functions.c xminicom
-+EXTRA_DIST = functions.c
-
@@ -1,11 +1,7 @@
-$NetBSD: patch-ab,v 1.4 2005/06/19 11:34:45 veego Exp $
+$NetBSD: patch-ab,v 1.5 2011/08/01 09:30:33 adam Exp $
---- man/Makefile.am.orig 2003-03-30 22:49:40.000000000 +0200
+--- man/Makefile.am.orig 2009-12-12 15:47:47.000000000 +0000
-+++ man/Makefile.am 2005-05-17 21:57:15.000000000 +0200
++++ man/Makefile.am
-@@ -1,5 +1,5 @@
+@@ -1 +1 @@
- AUTOMAKE_OPTIONS = dist-tarZ no-dependencies 1.0
+-dist_man_MANS = ascii-xfr.1 minicom.1 runscript.1 xminicom.1
-
++dist_man_MANS = ascii-xfr.1 minicom.1 runscript.1
--man_MANS = ascii-xfr.1 minicom.1 runscript.1 xminicom.1
-+man_MANS = ascii-xfr.1 minicom.1 runscript.1
-
- EXTRA_DIST = $(man_MANS)
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.5 2005/06/19 11:34:45 veego Exp $
+$NetBSD: patch-ac,v 1.6 2011/08/01 09:30:33 adam Exp $
---- src/updown.c.orig 2003-04-13 00:52:20.000000000 +0200
-+++ src/updown.c 2005-05-17 20:33:24.000000000 +0200
-@@ -245,7 +245,7 @@
+--- src/updown.c.orig 2010-05-30 20:34:00.000000000 +0000
++++ src/updown.c
+@@ -294,7 +294,7 @@ void updown(int what, int nr)
do_log("%s", 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);
+- win = mc_wopen(10, 7, 70, 13, BSINGLE, stdattr, mfcolor, mbcolor, 1, 0, 1);
++ win = mc_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"));
+ what == 'U' ? _("upload") : _("download"));
- wtitle(win, TMID, title);
+ mc_wtitle(win, TMID, title);
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.5 2005/07/11 17:29:16 veego Exp $
+$NetBSD: patch-ae,v 1.6 2011/08/01 09:30:33 adam Exp $
--- src/windiv.c.orig 2003-04-22 01:56:46.000000000 +0200
+++ src/windiv.c 2005-06-29 07:03:12.000000000 +0200
-@@ -21,2 +21,3 @@
+@@ -22,2 +22,3 @@
+#include <sys/types.h>
#include <dirent.h>
@@ -1,41 +1,41 @@
-$NetBSD: patch-ad,v 1.7 2007/06/19 21:46:40 jlam Exp $
+$NetBSD: patch-ad,v 1.8 2011/08/01 09:30:33 adam Exp $
---- src/rwconf.c.orig 2003-04-13 00:52:20.000000000 +0200
-+++ src/rwconf.c 2005-06-19 10:57:52.000000000 +0200
-@@ -80,27 +80,15 @@
- { "", PUBLIC, "pname10" },
- { "", PUBLIC, "pname11" },
- { "", PUBLIC, "pname12" },
+--- src/rwconf.c.orig 2011-01-16 10:01:18.000000000 +0000
++++ src/rwconf.c
+@@ -76,27 +76,15 @@ struct pars mpars[] = {
+ { "", 0, "pname10" },
+ { "", 0, "pname11" },
+ { "", 0, "pname12" },
-#if defined(__linux__) || defined(__GNU__)
-- { "/usr/bin/sz -vv -b", PUBLIC, "pprog1" },
-- { "/usr/bin/sb -vv", PUBLIC, "pprog2" },
-- { "/usr/bin/sx -vv", PUBLIC, "pprog3" },
-- { "/usr/bin/rz -vv -b -E", PUBLIC, "pprog4" },
-- { "/usr/bin/rb -vv", PUBLIC, "pprog5" },
-- { "/usr/bin/rx -vv", PUBLIC, "pprog6" },
-- { "/usr/bin/kermit -i -l %l -s", PUBLIC, "pprog7" },
-- { "/usr/bin/kermit -i -l %l -r", PUBLIC, "pprog8" },
+- { "/usr/bin/sz -vv -b", 0, "pprog1" },
+- { "/usr/bin/sb -vv", 0, "pprog2" },
+- { "/usr/bin/sx -vv", 0, "pprog3" },
+- { "/usr/bin/rz -vv -b -E", 0, "pprog4" },
+- { "/usr/bin/rb -vv", 0, "pprog5" },
+- { "/usr/bin/rx -vv", 0, "pprog6" },
+- { "/usr/bin/kermit -i -l %l -b %b -s", 0, "pprog7" },
+- { "/usr/bin/kermit -i -l %l -b %b -r", 0, "pprog8" },
-#else
- /* Most sites have this in /usr/local, except Linux. */
-- { "/usr/local/bin/sz -vv", PUBLIC, "pprog1" },
-- { "/usr/local/bin/sb -vv", PUBLIC, "pprog2" },
-- { "/usr/local/bin/sx -vv", PUBLIC, "pprog3" },
-- { "/usr/local/bin/rz -vv", PUBLIC, "pprog4" },
-- { "/usr/local/bin/rb -vv", PUBLIC, "pprog5" },
-- { "/usr/local/bin/rx -vv", PUBLIC, "pprog6" },
-- { "/usr/local/bin/kermit -i -l %l -s", PUBLIC, "pprog7" },
-- { "/usr/local/bin/kermit -i -l %l -r", PUBLIC, "pprog8" },
+- { "/usr/local/bin/sz -vv", 0, "pprog1" },
+- { "/usr/local/bin/sb -vv", 0, "pprog2" },
+- { "/usr/local/bin/sx -vv", 0, "pprog3" },
+- { "/usr/local/bin/rz -vv", 0, "pprog4" },
+- { "/usr/local/bin/rb -vv", 0, "pprog5" },
+- { "/usr/local/bin/rx -vv", 0, "pprog6" },
+- { "/usr/local/bin/kermit -i -l %l -s", 0, "pprog7" },
+- { "/usr/local/bin/kermit -i -l %l -r", 0, "pprog8" },
-#endif
-- { "/usr/bin/ascii-xfr -dsv", PUBLIC, "pprog9" },
+- { "/usr/bin/ascii-xfr -dsv", 0, "pprog9" },
-+ { "@LRZSZ_PREFIX@/bin/lsz -vv -b", PUBLIC, "pprog1" },
++ { "@LRZSZ_PREFIX@/bin/lsz -vv", 0, "pprog1" },
-+ { "@LRZSZ_PREFIX@/bin/lsb -vv", PUBLIC, "pprog2" },
++ { "@LRZSZ_PREFIX@/bin/lsb -vv", 0, "pprog2" },
-+ { "@LRZSZ_PREFIX@/bin/lsx -vv", PUBLIC, "pprog3" },
++ { "@LRZSZ_PREFIX@/bin/lsx -vv", 0, "pprog3" },
-+ { "@LRZSZ_PREFIX@/bin/lrz -vv -b", PUBLIC, "pprog4" },
++ { "@LRZSZ_PREFIX@/bin/lrz -vv", 0, "pprog4" },
-+ { "@LRZSZ_PREFIX@/bin/lrb -vv", PUBLIC, "pprog5" },
++ { "@LRZSZ_PREFIX@/bin/lrb -vv", 0, "pprog5" },
-+ { "@LRZSZ_PREFIX@/bin/lrx -vv", PUBLIC, "pprog6" },
++ { "@LRZSZ_PREFIX@/bin/lrx -vv", 0, "pprog6" },
-+ { "@GKERMIT_PREFIX@/bin/gkermit -i -l %l -s", PUBLIC, "pprog7" },
++ { "@LRZSZ_PREFIX@/bin/gkermit -i -l %l -s", 0, "pprog7" },
-+ { "@GKERMIT_PREFIX@/bin/gkermit -i -l %l -r", PUBLIC, "pprog8" },
++ { "@LRZSZ_PREFIX@/bin/gkermit -i -l %l -r", 0, "pprog8" },
-+ { "@PREFIX@/bin/ascii-xfr -dsv", PUBLIC, "pprog9" },
++ { "@PREFIX@/bin/ascii-xfr -dsv", 0, "pprog9" },
- { "", PUBLIC, "pprog10" },
+ { "", 0, "pprog10" },
- { "", PUBLIC, "pprog11" },
+ { "", 0, "pprog11" },
- { "", PUBLIC, "pprog12" },
+ { "", 0, "pprog12" },
@@ -1,19 +1,16 @@
-$NetBSD: patch-ag,v 1.3 2005/12/19 14:34:33 joerg Exp $
+$NetBSD: patch-ag,v 1.4 2011/08/01 09:30:33 adam Exp $
---- src/getsdir.c.orig 2005-12-19 14:23:45.000000000 +0000
+--- src/getsdir.c.orig 2009-12-12 15:47:47.000000000 +0000
+++ src/getsdir.c
-@@ -207,9 +207,14 @@ int *len;
- int l;
+@@ -185,7 +185,11 @@ int getsdir(const char *dirpath, const c
+ int l;
- /* copy the filename */
+ /* copy the filename */
+#ifdef NAME_MAX
-+ strncpy(datb_cur->data[datb_cur->cnt].fname,
-+ dp->d_name, NAME_MAX);
++ strncpy(datb_cur->data[datb_cur->cnt].fname, dp->d_name, NAME_MAX);
+#else
- strncpy(datb_cur->data[datb_cur->cnt].fname,
- dp->d_name,
- MAXNAMLEN);
+ strncpy(datb_cur->data[datb_cur->cnt].fname, dp->d_name, MAXNAMLEN);
+#endif
- /* get information about the directory entry */
+ /* get information about the directory entry */
- snprintf(fpath, sizeof(fpath), "%s/%s", dirpath, dp->d_name);
+ snprintf(fpath, sizeof(fpath), "%s/%s", dirpath, dp->d_name);
@@ -1,19 +1,16 @@
-$NetBSD: patch-ah,v 1.1 2005/12/19 14:34:33 joerg Exp $
+$NetBSD: patch-ah,v 1.2 2011/08/01 09:30:33 adam Exp $
---- src/getsdir.h.orig 2005-12-19 14:24:44.000000000 +0000
+--- src/getsdir.h.orig 2009-12-12 15:47:47.000000000 +0000
+++ src/getsdir.h
-@@ -19,9 +19,14 @@
- */
-
+@@ -25,7 +25,11 @@
#include <dirent.h>
-+#include <limits.h>
typedef struct dirEntry { /* structure of data item */
+#ifdef NAME_MAX
-+ char fname[NAME_MAX + 1];
++ char fname[NAME_MAX + 1];
+#else
- char fname[MAXNAMLEN + 1]; /* filename + terminating null */
+ char fname[MAXNAMLEN + 1]; /* filename + terminating null */
+#endif
- time_t time; /* last modification date */
+ time_t time; /* last modification date */
- mode_t mode; /* file mode (dir? etc.) */
+ mode_t mode; /* file mode (dir? etc.) */
- ushort cflags; /* caller field for convenience */
+ ushort cflags; /* caller field for convenience */