8 files changed, 22 insertions, 28 deletions

diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index ca35e0f2510e..6f326b858b49 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -4,9 +4,7 @@
 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"
@@ -15,11 +13,6 @@ 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
@@ -29,6 +22,11 @@ CONFIGURE_ARGS+=	--enable-dfl-baud=57600 \
 			--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@; \
@@ -38,6 +36,8 @@ post-patch:
 
 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}/
diff --git a/comms/minicom/files/patch-minirc.dfl b/comms/minicom/files/patch-minirc.dfl
index b3839faed9e4..db0d8dae9a0c 100644
--- a/comms/minicom/files/patch-minirc.dfl
+++ b/comms/minicom/files/patch-minirc.dfl
@@ -1,5 +1,5 @@
---- 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.
diff --git a/comms/minicom/files/patch-src-minicom.h b/comms/minicom/files/patch-src-minicom.h
index 10c553f9dddb..2f714b1dcaad 100644
--- a/comms/minicom/files/patch-src-minicom.h
+++ b/comms/minicom/files/patch-src-minicom.h
@@ -1,5 +1,5 @@
---- 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>
diff --git a/comms/minicom/files/patch-src-script.c b/comms/minicom/files/patch-src-script.c
index e1a137ede73a..2af8b806b973 100644
--- a/comms/minicom/files/patch-src-script.c
+++ b/comms/minicom/files/patch-src-script.c
@@ -1,5 +1,5 @@
---- 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
diff --git a/comms/minicom/files/patch-src-updown.c b/comms/minicom/files/patch-src-updown.c
index c1235b5d38fb..48db9ee508d1 100644
--- a/comms/minicom/files/patch-src-updown.c
+++ b/comms/minicom/files/patch-src-updown.c
@@ -1,5 +1,5 @@
---- 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 */
  
diff --git a/comms/minicom/files/patch-src-window.c b/comms/minicom/files/patch-src-window.c
index f52faa6af245..8eefb31cd206 100644
--- a/comms/minicom/files/patch-src-window.c
+++ b/comms/minicom/files/patch-src-window.c
@@ -1,6 +1,6 @@
---- 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;
diff --git a/comms/minicom/files/patch-sysdep1.c b/comms/minicom/files/patch-sysdep1.c
index dbe756a9d059..ba4569d8d915 100644
--- a/comms/minicom/files/patch-sysdep1.c
+++ b/comms/minicom/files/patch-sysdep1.c
@@ -1,5 +1,5 @@
---- 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;
diff --git a/comms/minicom/pkg-plist b/comms/minicom/pkg-plist
index a4901dfe35c2..877f25519f1d 100644
--- a/comms/minicom/pkg-plist
+++ b/comms/minicom/pkg-plist
@@ -1,13 +1,8 @@
-@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
@@ -30,7 +25,6 @@ man/man1/xminicom.1.gz
 %%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