diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile index bc9269937ca..343f8626403 100644 --- a/comms/minicom/Makefile +++ b/comms/minicom/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.54 2013/03/11 01:30:26 espie Exp $ +# $OpenBSD: Makefile,v 1.55 2013/03/27 12:14:28 gonzalo Exp $ COMMENT= MS-DOS Telix-like serial communication program -DISTNAME= minicom-2.5 +DISTNAME= minicom-2.6.2 CATEGORIES= comms -MASTER_SITES= http://alioth.debian.org/frs/download.php/3487/ +MASTER_SITES= http://alioth.debian.org/frs/download.php/3869/ HOMEPAGE= http://alioth.debian.org/projects/minicom/ MAINTAINER= Chris Kuethe diff --git a/comms/minicom/distinfo b/comms/minicom/distinfo index 62b8d2ab29e..f301e489362 100644 --- a/comms/minicom/distinfo +++ b/comms/minicom/distinfo @@ -1,5 +1,2 @@ -MD5 (minicom-2.5.tar.gz) = pRF9TSHiyegl7bWG7i/o0g== -RMD160 (minicom-2.5.tar.gz) = QTG57zfSXPj3enD8S03jLniWzCM= -SHA1 (minicom-2.5.tar.gz) = RCJQMU3mMYm2Gfh0TAZpRF4s3R0= -SHA256 (minicom-2.5.tar.gz) = KqQ/mFgNPJxZsSiV8VeDaVzehUcva/x5dLzAk1rwqP0= -SIZE (minicom-2.5.tar.gz) = 822499 +SHA256 (minicom-2.6.2.tar.gz) = 888hX3kU/6VSjjmJYhdhAq103ye6OJWBQvVqptFckWg= +SIZE (minicom-2.6.2.tar.gz) = 855340 diff --git a/comms/minicom/patches/patch-man_minicom_1 b/comms/minicom/patches/patch-man_minicom_1 index 1a7cbe6d08b..b407d183cdc 100644 --- a/comms/minicom/patches/patch-man_minicom_1 +++ b/comms/minicom/patches/patch-man_minicom_1 @@ -1,7 +1,7 @@ -$OpenBSD: patch-man_minicom_1,v 1.3 2012/03/19 22:17:43 sthen Exp $ ---- man/minicom.1.orig Mon Aug 9 20:54:03 2010 -+++ man/minicom.1 Fri Mar 16 22:24:59 2012 -@@ -822,7 +822,8 @@ $HOME/minicom.log +$OpenBSD: patch-man_minicom_1,v 1.4 2013/03/27 12:14:28 gonzalo Exp $ +--- man/minicom.1.orig Sun Sep 2 14:29:30 2012 ++++ man/minicom.1 Thu Mar 7 11:33:10 2013 +@@ -829,7 +829,8 @@ $HOME/minicom.log /usr/share/locale/*/LC_MESSAGES/minicom.mo .fi .SH SEE ALSO diff --git a/comms/minicom/patches/patch-src_main_c b/comms/minicom/patches/patch-src_main_c index 44353f61f0f..1c2218296fb 100644 --- a/comms/minicom/patches/patch-src_main_c +++ b/comms/minicom/patches/patch-src_main_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_main_c,v 1.3 2012/03/19 22:17:43 sthen Exp $ ---- src/main.c.orig Fri Jul 16 09:50:18 2010 -+++ src/main.c Fri Mar 16 22:29:07 2012 +$OpenBSD: patch-src_main_c,v 1.4 2013/03/27 12:14:28 gonzalo Exp $ +--- src/main.c.orig Sat Feb 11 10:24:25 2012 ++++ src/main.c Wed Dec 12 09:06:00 2012 @@ -23,6 +23,9 @@ #include #endif @@ -11,10 +11,11 @@ $OpenBSD: patch-src_main_c,v 1.3 2012/03/19 22:17:43 sthen Exp $ #include "port.h" #include "minicom.h" #include "intl.h" -@@ -295,6 +298,17 @@ int open_term(int doinit, int show_win_on_error, int n +@@ -304,6 +307,17 @@ nolock: + /* Set CLOCAL mode */ m_nohang(portfd); - ++ + /* maybe, just maybe, we're looking at a GPS */ + do { + int nmeadisc = NMEADISC; @@ -25,16 +26,6 @@ $OpenBSD: patch-src_main_c,v 1.3 2012/03/19 22:17:43 sthen Exp $ + ioctl(portfd, TIOCSETD, &nmeadisc); + ioctl(portfd, TIOCSTSTAMP, &tstamps); + } while (0); -+ + /* Set Hangup on Close if program crashes. (Hehe) */ m_hupcl(portfd, 1); - if (doinit > 0) -@@ -444,7 +458,7 @@ void time_status(void) - if (online < 0) - mc_wprintf(st, " %12.12s ", P_HASDCD[0] == 'Y' ? _("Offline") : _("OFFLINE")); - else -- mc_wprintf(st, " %s %02ld:%02ld", P_HASDCD[0] == 'Y' ? _("Online") : _("ONLINE"), -+ mc_wprintf(st, " %s %02d:%02d", P_HASDCD[0] == 'Y' ? _("Online") : _("ONLINE"), - online / 3600, (online / 60) % 60); - - ret_csr(); diff --git a/comms/minicom/patches/patch-src_updown_c b/comms/minicom/patches/patch-src_updown_c index 30a866f6be1..e6398b28946 100644 --- a/comms/minicom/patches/patch-src_updown_c +++ b/comms/minicom/patches/patch-src_updown_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_updown_c,v 1.4 2012/03/19 22:17:43 sthen Exp $ ---- src/updown.c.orig Sun May 30 21:34:00 2010 -+++ src/updown.c Fri Mar 16 22:27:20 2012 -@@ -45,7 +45,7 @@ static int mcd(char *dir) +$OpenBSD: patch-src_updown_c,v 1.5 2013/03/27 12:14:28 gonzalo Exp $ +--- src/updown.c.orig Thu Jan 10 18:03:13 2013 ++++ src/updown.c Thu Mar 7 11:33:10 2013 +@@ -47,7 +47,7 @@ static int mcd(char *dir) { char buf[256]; char err[50]; @@ -10,7 +10,7 @@ $OpenBSD: patch-src_updown_c,v 1.4 2012/03/19 22:17:43 sthen Exp $ static int init = 0; if (!init) { -@@ -294,7 +294,7 @@ void updown(int what, int nr) +@@ -298,7 +298,7 @@ void updown(int what, int nr) do_log("%s", cmdline); /* jl 22.06.97 */ if (P_PFULL(g) == 'N') {