9 files changed, 51 insertions, 29 deletions

diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index 9f9ef38df8d7..9afb465d4be5 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -7,9 +7,9 @@
 #
 
 PORTNAME=	minicom
-PORTVERSION=	2.5
+PORTVERSION=	2.6
 CATEGORIES=	comms
-MASTER_SITES=	http://alioth.debian.org/frs/download.php/3487/
+MASTER_SITES=	http://alioth.debian.org/frs/download.php/3689/
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	An MS-DOS Telix serial communication program "workalike"
diff --git a/comms/minicom/distinfo b/comms/minicom/distinfo
index 9a051e52e380..da90a5537cac 100644
--- a/comms/minicom/distinfo
+++ b/comms/minicom/distinfo
@@ -1,2 +1,2 @@
-SHA256 (minicom-2.5.tar.gz) = 2aa43f98580d3c9c59b12895f15783695cde85472f6bfc7974bcc0935af0a8fd
-SIZE (minicom-2.5.tar.gz) = 822499
+SHA256 (minicom-2.6.tar.gz) = ea5fe79c22dcb115cf5ed287b0e7a69e069bedd39889aa89b1a23f64f53fceb3
+SIZE (minicom-2.6.tar.gz) = 830255
diff --git a/comms/minicom/files/patch-ac b/comms/minicom/files/patch-ac
index 56431e4f56e6..05fee081d74b 100644
--- a/comms/minicom/files/patch-ac
+++ b/comms/minicom/files/patch-ac
@@ -1,6 +1,6 @@
---- src/updown.c.orig	2008-04-17 19:52:52.000000000 +0200
-+++ src/updown.c	2008-04-17 19:53:27.000000000 +0200
-@@ -244,7 +244,7 @@
+--- src/updown.c.orig	2011-09-07 23:04:32.000000000 +0200
++++ src/updown.c	2011-12-28 16:07:59.000000000 +0100
+@@ -296,7 +296,7 @@ void updown(int what, int nr)
      do_log("%s", cmdline);   /* jl 22.06.97 */
  
    if (P_PFULL(g) == 'N') {
diff --git a/comms/minicom/files/patch-af b/comms/minicom/files/patch-af
index c721ec7c927d..f52faa6af245 100644
--- a/comms/minicom/files/patch-af
+++ b/comms/minicom/files/patch-af
@@ -1,6 +1,6 @@
---- src/window.c.orig	2008-02-06 22:49:55.000000000 +0100
-+++ src/window.c	2008-04-17 20:08:10.000000000 +0200
-@@ -70,6 +70,7 @@
+--- src/window.c.orig	2010-12-12 14:56:25.000000000 +0100
++++ src/window.c	2011-12-28 16:07:59.000000000 +0100
+@@ -66,6 +66,7 @@ static const char *CE, *Al, *Dl, *AL, *D
  static const char *CS, *SF, *SR, *VB, *BL;
  static const char *VE, *VI, *KS, *KE;
  static const char *CD, *CL, *IC, *DC;
@@ -8,7 +8,7 @@
  static const char *CR, *NL;
  #ifdef ST_LINE
  static const char *TS, *FS, *DS;
-@@ -342,8 +343,8 @@
+@@ -335,8 +336,8 @@ static void _gotoxy(int x, int y)
    else if (NL != NULL && x == 0 && x == curx && y == cury + 1)
      outstr(NL);
  #endif
@@ -19,7 +19,7 @@
    else
      outstr(tgoto(CM, x, y));
    curx = x;
-@@ -2007,7 +2008,7 @@
+@@ -2000,7 +2001,7 @@ int win_init(int fg, int bg, int attr)
    CL = tgetstr("cl", &_tptr);
    IC = tgetstr("ic", &_tptr);
    DC = tgetstr("dc", &_tptr);
@@ -28,7 +28,7 @@
    CR = tgetstr("cr", &_tptr);
    NL = tgetstr("nl", &_tptr);
    AC = tgetstr("ac", &_tptr);
-@@ -2066,11 +2067,11 @@
+@@ -2059,11 +2060,11 @@ int win_init(int fg, int bg, int attr)
    _has_am = tgetflag("am");
    _mv_standout = tgetflag("ms");
    if (tgetflag("bs")) {
diff --git a/comms/minicom/files/patch-minirc.dfl b/comms/minicom/files/patch-minirc.dfl
index 1e588d621a42..a6cc21985043 100644
--- a/comms/minicom/files/patch-minirc.dfl
+++ b/comms/minicom/files/patch-minirc.dfl
@@ -1,7 +1,7 @@
---- doc/minirc.dfl.orig	2003-03-30 20:55:39.000000000 +0200
-+++ doc/minirc.dfl	2008-04-17 20:17:35.000000000 +0200
+--- doc/minirc.dfl.orig	2009-12-12 16:47:47.000000000 +0100
++++ doc/minirc.dfl	2011-12-28 16:07:59.000000000 +0100
 @@ -1,2 +1,7 @@
- # $Id: minirc.dfl,v 1.1.1.1 2003/03/30 18:55:39 al-guest Exp $
+ # $Id: minirc.dfl,v 1.1.1.1 2003-03-30 18:55:39 al-guest Exp $
  # Machine-generated file - use "minicom -s" to change parameters.
 +pr port             /dev/cuad0
 +pu baudrate         9600
diff --git a/comms/minicom/files/patch-src-main.c b/comms/minicom/files/patch-src-main.c
new file mode 100644
index 000000000000..2dd01963c443
--- /dev/null
+++ b/comms/minicom/files/patch-src-main.c
@@ -0,0 +1,11 @@
+--- src/main.c.orig	2011-09-30 09:57:00.000000000 +0200
++++ src/main.c	2011-12-28 16:07:59.000000000 +0100
+@@ -112,7 +112,7 @@ char *esc_key(void)
+ static void get_alrm(int dummy)
+ {
+   (void)dummy;
+-  errno = ETIME;
++  errno = ETIMEDOUT;
+   longjmp(albuf, 1);
+ }
+ 
diff --git a/comms/minicom/files/patch-src-minicom.h b/comms/minicom/files/patch-src-minicom.h
index 74c4b7c2a0cf..10c553f9dddb 100644
--- a/comms/minicom/files/patch-src-minicom.h
+++ b/comms/minicom/files/patch-src-minicom.h
@@ -1,10 +1,10 @@
---- src/minicom.h.orig	2008-04-17 20:06:14.000000000 +0200
-+++ src/minicom.h	2008-04-17 20:06:22.000000000 +0200
-@@ -34,6 +34,7 @@
- #include "libport.h"
+--- src/minicom.h.orig	2011-09-30 09:57:22.000000000 +0200
++++ src/minicom.h	2011-12-28 16:12:54.000000000 +0100
+@@ -35,6 +35,7 @@
  
  #include <time.h>
+ #include <stdbool.h>
 +#include <limits.h>
  
- #ifdef USE_SOCKET
- #include <sys/socket.h>
+ #if HAVE_LOCKDEV
+ #include <ttylock.h>
diff --git a/comms/minicom/files/patch-src-script.c b/comms/minicom/files/patch-src-script.c
new file mode 100644
index 000000000000..6cc638522a92
--- /dev/null
+++ b/comms/minicom/files/patch-src-script.c
@@ -0,0 +1,11 @@
+--- src/script.c.orig	2011-07-23 19:58:32.000000000 +0200
++++ src/script.c	2011-12-28 16:07:59.000000000 +0100
+@@ -69,7 +69,7 @@ struct env {
+ struct env *curenv;		/* Execution environment */
+ int gtimeout = 120;		/* Global Timeout */
+ int etimeout = 0;		/* Timeout in expect routine */
+-jmp_buf ejmp;			/* To jump to if expect times out */
++sigjmp_buf ejmp;		/* To jump to if expect times out */
+ int inexpect = 0;		/* Are we in the expect routine */
+ const char *newline;		/* What to print for '\n'. */
+ const char *s_login = "name";	/* User's login name */
diff --git a/comms/minicom/files/patch-sysdep1.c b/comms/minicom/files/patch-sysdep1.c
index 467e1858167a..dbe756a9d059 100644
--- a/comms/minicom/files/patch-sysdep1.c
+++ b/comms/minicom/files/patch-sysdep1.c
@@ -1,6 +1,6 @@
---- src/sysdep1.c.orig	2007-10-10 22:18:20.000000000 +0200
-+++ src/sysdep1.c	2008-04-17 19:48:58.000000000 +0200
-@@ -84,13 +84,13 @@
+--- src/sysdep1.c.orig	2009-12-12 16:47:47.000000000 +0100
++++ src/sysdep1.c	2011-12-28 16:07:59.000000000 +0100
+@@ -65,13 +65,13 @@ static void m_setrts(int fd)
    if (portfd_is_socket)
      return;
  #endif
@@ -16,8 +16,8 @@
 +    ioctl(fd, TIOCMSET, &mcs);
    }
  #endif
- #ifdef _COHERENT
-@@ -213,11 +213,11 @@
+ }
+@@ -180,11 +180,11 @@ int m_getdcd(int fd)
      return portfd_is_connected;
    }
  #endif
@@ -31,7 +31,7 @@
        return -1;
      return mcs & TIOCM_CAR ? 1 : 0;
    }
-@@ -260,8 +260,8 @@
+@@ -227,8 +227,8 @@ void m_savestate(int fd)
    ioctl(fd, TIOCLGET, &lsw);
  #  endif
  #endif
@@ -42,7 +42,7 @@
  #endif
  }
  
-@@ -285,8 +285,8 @@
+@@ -252,8 +252,8 @@ void m_restorestate(int fd)
    ioctl(fd, TIOCLSET, &lsw);
  #  endif
  #endif