Index: head/comms/minicom/Makefile
===================================================================
--- head/comms/minicom/Makefile	(revision 525147)
+++ head/comms/minicom/Makefile	(revision 525148)
@@ -1,49 +1,49 @@
 # Created by: obrien@cs.ucdavis.edu
 # $FreeBSD$
 
 PORTNAME=	minicom
 PORTVERSION=	2.7.1
 CATEGORIES=	comms
-MASTER_SITES=	https://alioth.debian.org/frs/download.php/file/4215/ \
-		http://alioth.debian.org/frs/download.php/file/4215/ \
-		http://fossies.org/linux/misc/
+MASTER_SITES=	https://fossies.org/linux/misc/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MS-DOS Telix serial communication program "workalike"
 
 LICENSE=	GPLv2+
 
 RUN_DEPENDS=	lrz:comms/lrzsz
 
-OPTIONS_DEFINE=	DOCS NLS
-OPTIONS_SUB=	yes
-NLS_USES=	gettext
-NLS_CONFIGURE_ENABLE=	nls
-
 USES=		iconv ncurses
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib ${ICONV_LIB} -lncurses
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-dfl-baud=57600 \
 			--sysconfdir=${PREFIX}/etc/minicom \
 			--enable-lock-dir=/var/spool/lock \
 			--enable-dfl-port=/dev/cuau0
 
+OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=	nls
+
 post-patch:
 	${REINPLACE_CMD} -e "s@/usr/local/bin/@${LOCALBASE}/bin/@; \
 		s@/sz@/lsz@;s@/sb@/lsb@;s@/sx@/lsx@;s@/rz@/lrz@; \
 		s@/rb@/lrb@;s@/rx@/lrx@" ${WRKSRC}/src/rwconf.c
 	${REINPLACE_CMD} -E -e "s@^(SUBDIRS = .*) intl@\1@" \
 		${WRKSRC}/Makefile.in
 
 post-install:
 	${INSTALL} -d -m 0755 ${STAGEDIR}${PREFIX}/etc/minicom
+
+post-install-DOCS-on:
 	${INSTALL} -d -m 0755 ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR}/
 	(umask 022 && cd ${WRKSRC} && ${TAR} --exclude '*/Makefile*' \
 		 --exclude '*.orig' -chf - extras doc | ${TAR}  -xf - -C \
 		${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/comms/minicom/files/patch-minirc.dfl
===================================================================
--- head/comms/minicom/files/patch-minirc.dfl	(revision 525147)
+++ head/comms/minicom/files/patch-minirc.dfl	(revision 525148)
@@ -1,10 +1,10 @@
---- doc/minirc.dfl.orig	2009-12-12 16:47:47.000000000 +0100
-+++ doc/minirc.dfl	2011-12-28 16:07:59.000000000 +0100
+--- doc/minirc.dfl.orig	2009-12-12 15:47:47 UTC
++++ doc/minirc.dfl
 @@ -1,2 +1,7 @@
  # $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/cuau0
 +pu baudrate         9600
 +pu bits             8
 +pu parity           N
 +pu minit            
Index: head/comms/minicom/files/patch-src-minicom.h
===================================================================
--- head/comms/minicom/files/patch-src-minicom.h	(revision 525147)
+++ head/comms/minicom/files/patch-src-minicom.h	(revision 525148)
@@ -1,10 +1,10 @@
---- src/minicom.h.orig	2011-09-30 09:57:22.000000000 +0200
-+++ src/minicom.h	2011-12-28 16:12:54.000000000 +0100
+--- src/minicom.h.orig	2013-12-08 10:26:03 UTC
++++ src/minicom.h
 @@ -35,6 +35,7 @@
  
  #include <time.h>
  #include <stdbool.h>
 +#include <limits.h>
  
  #if HAVE_LOCKDEV
  #include <ttylock.h>
Index: head/comms/minicom/files/patch-src-script.c
===================================================================
--- head/comms/minicom/files/patch-src-script.c	(revision 525147)
+++ head/comms/minicom/files/patch-src-script.c	(revision 525148)
@@ -1,19 +1,19 @@
---- src/script.c.orig	2013-10-29 12:07:42.000000000 +0100
-+++ src/script.c	2014-01-02 20:30:55.000000000 +0100
+--- src/script.c.orig	2013-10-29 11:07:42 UTC
++++ src/script.c
 @@ -32,6 +32,7 @@
  #include <config.h>
  #endif
  
 +#include <sys/wait.h>
  #include <stdarg.h>
  
  #include "port.h"
 @@ -76,7 +77,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 */
Index: head/comms/minicom/files/patch-src-updown.c
===================================================================
--- head/comms/minicom/files/patch-src-updown.c	(revision 525147)
+++ head/comms/minicom/files/patch-src-updown.c	(revision 525148)
@@ -1,11 +1,11 @@
---- src/updown.c.orig	2013-12-08 11:25:06.000000000 +0100
-+++ src/updown.c	2014-01-02 20:30:33.000000000 +0100
+--- src/updown.c.orig	2013-12-08 10:25:06 UTC
++++ src/updown.c
 @@ -298,7 +298,7 @@ void updown(int what, int nr)
      do_log("%s", cmdline);   /* jl 22.06.97 */
  
    if (P_PFULL(g) == 'N') {
 -    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"));
      mc_wtitle(win, TMID, title);
Index: head/comms/minicom/files/patch-src-window.c
===================================================================
--- head/comms/minicom/files/patch-src-window.c	(revision 525147)
+++ head/comms/minicom/files/patch-src-window.c	(revision 525148)
@@ -1,45 +1,45 @@
---- 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
+--- src/window.c.orig	2010-12-12 13:56:25 UTC
++++ src/window.c
+@@ -66,6 +66,7 @@ static const char *CE, *Al, *Dl, *AL, *DL;
  static const char *CS, *SF, *SR, *VB, *BL;
  static const char *VE, *VI, *KS, *KE;
  static const char *CD, *CL, *IC, *DC;
 +static char *mcBC;
  static const char *CR, *NL;
  #ifdef ST_LINE
  static const char *TS, *FS, *DS;
 @@ -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
 -  else if (BC != NULL && y == cury && x == curx - 1)
 -    outstr(BC);
 +  else if (mcBC != NULL && y == cury && x == curx - 1)
 +    outstr(mcBC);
    else
      outstr(tgoto(CM, x, y));
    curx = x;
 @@ -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);
 -  BC = tgetstr("bc", &_tptr);
 +  mcBC = tgetstr("bc", &_tptr);
    CR = tgetstr("cr", &_tptr);
    NL = tgetstr("nl", &_tptr);
    AC = tgetstr("ac", &_tptr);
 @@ -2059,11 +2060,11 @@ int win_init(int fg, int bg, int attr)
    _has_am = tgetflag("am");
    _mv_standout = tgetflag("ms");
    if (tgetflag("bs")) {
 -    if (BC == NULL)
 -      BC = "\b";
 +    if (mcBC == NULL)
 +      mcBC = "\b";
    }
    else
 -    BC = NULL;
 +    mcBC = NULL;
  
    /* Special IBM box-drawing characters */
    D_UL  = 201;
Index: head/comms/minicom/files/patch-sysdep1.c
===================================================================
--- head/comms/minicom/files/patch-sysdep1.c	(revision 525147)
+++ head/comms/minicom/files/patch-sysdep1.c	(revision 525148)
@@ -1,55 +1,55 @@
---- src/sysdep1.c.orig	2009-12-12 16:47:47.000000000 +0100
-+++ src/sysdep1.c	2011-12-28 16:07:59.000000000 +0100
+--- src/sysdep1.c.orig	2009-12-12 15:47:47 UTC
++++ src/sysdep1.c
 @@ -65,13 +65,13 @@ static void m_setrts(int fd)
    if (portfd_is_socket)
      return;
  #endif
 -#if defined(TIOCM_RTS) && defined(TIOCMODG)
 +#if defined(TIOCM_RTS) && defined(TIOCMGET)
    {
      int mcs=0;
  
 -    ioctl(fd, TIOCMODG, &mcs);
 +    ioctl(fd, TIOCMGET, &mcs);
      mcs |= TIOCM_RTS;
 -    ioctl(fd, TIOCMODS, &mcs);
 +    ioctl(fd, TIOCMSET, &mcs);
    }
  #endif
  }
 @@ -180,11 +180,11 @@ int m_getdcd(int fd)
      return portfd_is_connected;
    }
  #endif
 -#ifdef TIOCMODG
 +#ifdef TIOCMODGET
    {
      int mcs = 0;
  
 -    if (ioctl(fd, TIOCMODG, &mcs) < 0)
 +    if (ioctl(fd, TIOCMODGET, &mcs) < 0)
        return -1;
      return mcs & TIOCM_CAR ? 1 : 0;
    }
 @@ -227,8 +227,8 @@ void m_savestate(int fd)
    ioctl(fd, TIOCLGET, &lsw);
  #  endif
  #endif
 -#ifdef TIOCMODG
 -  ioctl(fd, TIOCMODG, &m_word);
 +#ifdef TIOCMGET
 +  ioctl(fd, TIOCMGET, &m_word);
  #endif
  }
  
 @@ -252,8 +252,8 @@ void m_restorestate(int fd)
    ioctl(fd, TIOCLSET, &lsw);
  #  endif
  #endif
 -#ifdef TIOCMODS
 -  ioctl(fd, TIOCMODS, &m_word);
 +#ifdef TIOCMSET
 +  ioctl(fd, TIOCMSET, &m_word);
  #endif
  }
  
Index: head/comms/minicom/pkg-plist
===================================================================
--- head/comms/minicom/pkg-plist	(revision 525147)
+++ head/comms/minicom/pkg-plist	(revision 525148)
@@ -1,78 +1,72 @@
-@owner uucp
-@group dialer
-@mode 4511
 bin/minicom
-@owner
-@group
-@mode
 bin/xminicom
 bin/runscript
 bin/ascii-xfr
+@dir %%ETCDIR%%
 man/man1/minicom.1.gz
 man/man1/runscript.1.gz
 man/man1/ascii-xfr.1.gz
 man/man1/xminicom.1.gz
 %%NLS%%share/locale/cs/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/da/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/de/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/es/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/id/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/rw/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/minicom.mo
-@dir(uucp,,) etc/minicom
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/doc/Announce-1.78
 %%PORTDOCS%%%%DOCSDIR%%/doc/Announce-1.82
 %%PORTDOCS%%%%DOCSDIR%%/doc/Announce-1.82.1
 %%PORTDOCS%%%%DOCSDIR%%/doc/Announce-1.83
 %%PORTDOCS%%%%DOCSDIR%%/doc/COMPATABILITY.lrzsz
 %%PORTDOCS%%%%DOCSDIR%%/doc/ChangeLog.old
 %%PORTDOCS%%%%DOCSDIR%%/doc/HistSearch
 %%PORTDOCS%%%%DOCSDIR%%/doc/Locales
 %%PORTDOCS%%%%DOCSDIR%%/doc/Macros
 %%PORTDOCS%%%%DOCSDIR%%/doc/QuickStart.modemu
 %%PORTDOCS%%%%DOCSDIR%%/doc/README.lrzsz
 %%PORTDOCS%%%%DOCSDIR%%/doc/TODO.lrzsz
 %%PORTDOCS%%%%DOCSDIR%%/doc/Todo
 %%PORTDOCS%%%%DOCSDIR%%/doc/Todo.175
 %%PORTDOCS%%%%DOCSDIR%%/doc/Todo.Irix.dif
 %%PORTDOCS%%%%DOCSDIR%%/doc/Todo.emacskey.dif
 %%PORTDOCS%%%%DOCSDIR%%/doc/Todo.fsel
 %%PORTDOCS%%%%DOCSDIR%%/doc/copyright.modemu
 %%PORTDOCS%%%%DOCSDIR%%/doc/fselector.txt
 %%PORTDOCS%%%%DOCSDIR%%/doc/japanese
 %%PORTDOCS%%%%DOCSDIR%%/doc/minicom.FAQ
 %%PORTDOCS%%%%DOCSDIR%%/doc/minirc.dfl
 %%PORTDOCS%%%%DOCSDIR%%/doc/modemu.README
 %%PORTDOCS%%%%DOCSDIR%%/doc/pl-translation.txt
 %%PORTDOCS%%%%DOCSDIR%%/doc/portugues-brasil
 %%PORTDOCS%%%%DOCSDIR%%/doc/suomeksi
 %%PORTDOCS%%%%DOCSDIR%%/extras/htsalogin
 %%PORTDOCS%%%%DOCSDIR%%/extras/linux/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/extras/linux/README-FIRST
 %%PORTDOCS%%%%DOCSDIR%%/extras/linux/mtelnet
 %%PORTDOCS%%%%DOCSDIR%%/extras/saralogin
 %%PORTDOCS%%%%DOCSDIR%%/extras/scriptdemo
 %%PORTDOCS%%%%DOCSDIR%%/extras/tables/mc.iso
 %%PORTDOCS%%%%DOCSDIR%%/extras/tables/mc.noconv
 %%PORTDOCS%%%%DOCSDIR%%/extras/tables/mc.pc8
 %%PORTDOCS%%%%DOCSDIR%%/extras/tables/mc.sf7
 %%PORTDOCS%%%%DOCSDIR%%/extras/termcap/README
 %%PORTDOCS%%%%DOCSDIR%%/extras/termcap/termcap.long
 %%PORTDOCS%%%%DOCSDIR%%/extras/termcap/termcap.short
 %%PORTDOCS%%%%DOCSDIR%%/extras/terminfo/README
 %%PORTDOCS%%%%DOCSDIR%%/extras/terminfo/minicom
 %%PORTDOCS%%%%DOCSDIR%%/extras/unixlogin