Attachment #202452 for bug #230753





PORTNAME=	minicom
PORTVERSION=	2.7.1
PORTREVISION=	1
CATEGORIES=	comms
MASTER_SITES=	http://fossies.org/linux/misc/
		http://alioth.debian.org/frs/download.php/file/4215/ \
		http://fossies.org/linux/misc/

MAINTAINER=	johans@FreeBSD.org
COMMENT=	MS-DOS Telix serial communication program "workalike"

LICENSE=	GPLv2+
LICENSE_FILE=	${WRKSRC}/COPYING

RUN_DEPENDS=	lrz:comms/lrzsz

USES=		iconv ncurses
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
CPPFLAGS+=	-I${LOCALBASE}/include
LIBS+=		-L${LOCALBASE}/lib ${ICONV_LIB} -lncurses

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@; \

Line 0 Link Here

(-)files/patch-doc_minirc.dfl (+10 lines)
	1	--- doc/minirc.dfl.orig 2009-12-12 15:47:47 UTC
	2	+++ doc/minirc.dfl
	3	@@ -1,2 +1,7 @@
	4	# $Id: minirc.dfl,v 1.1.1.1 2003-03-30 18:55:39 al-guest Exp $
	5	# Machine-generated file - use "minicom -s" to change parameters.
	6	+pr port /dev/cuau0
	7	+pu baudrate 9600
	8	+pu bits 8
	9	+pu parity N
	10	+pu minit

Lines 1-10 Link Here

(-)files/patch-minirc.dfl (-10 lines)
1	--- doc/minirc.dfl.orig 2009-12-12 16:47:47.000000000 +0100
2	+++ doc/minirc.dfl 2011-12-28 16:07:59.000000000 +0100
3	@@ -1,2 +1,7 @@
4	# $Id: minirc.dfl,v 1.1.1.1 2003-03-30 18:55:39 al-guest Exp $
5	# Machine-generated file - use "minicom -s" to change parameters.
6	+pr port /dev/cuau0
7	+pu baudrate 9600
8	+pu bits 8
9	+pu parity N
10	+pu minit

Lines 1-5 Link Here

(-)files/patch-src-minicom.h (-2 / +2 lines)
1	--- src/minicom.h.orig 2011-09-30 09:57:22.000000000 +0200	1	--- src/minicom.h.orig 2013-12-08 10:26:03 UTC
2	+++ src/minicom.h 2011-12-28 16:12:54.000000000 +0100	2	+++ src/minicom.h
3	@@ -35,6 +35,7 @@	3	@@ -35,6 +35,7 @@
4		4
5	#include <time.h>	5	#include <time.h>

Lines 1-5 Link Here

(-)files/patch-src-script.c (-2 / +2 lines)
1	--- src/script.c.orig 2013-10-29 12:07:42.000000000 +0100	1	--- src/script.c.orig 2013-10-29 11:07:42 UTC
2	+++ src/script.c 2014-01-02 20:30:55.000000000 +0100	2	+++ src/script.c
3	@@ -32,6 +32,7 @@	3	@@ -32,6 +32,7 @@
4	#include <config.h>	4	#include <config.h>
5	#endif	5	#endif

Lines 1-5 Link Here

(-)files/patch-src-updown.c (-2 / +2 lines)
1	--- src/updown.c.orig 2013-12-08 11:25:06.000000000 +0100	1	--- src/updown.c.orig 2013-12-08 10:25:06 UTC
2	+++ src/updown.c 2014-01-02 20:30:33.000000000 +0100	2	+++ src/updown.c
3	@@ -298,7 +298,7 @@ void updown(int what, int nr)	3	@@ -298,7 +298,7 @@ void updown(int what, int nr)
4	do_log("%s", cmdline); /* jl 22.06.97 */	4	do_log("%s", cmdline); /* jl 22.06.97 */
5		5

Lines 1-6 Link Here

(-)files/patch-src-window.c (-3 / +3 lines)
1	--- src/window.c.orig 2010-12-12 14:56:25.000000000 +0100	1	--- src/window.c.orig 2010-12-12 13:56:25 UTC
2	+++ src/window.c 2011-12-28 16:07:59.000000000 +0100	2	+++ src/window.c
3	@@ -66,6 +66,7 @@ static const char CE, Al, Dl, AL, *D	3	@@ -66,6 +66,7 @@ static const char CE, Al, Dl, AL, *DL;
4	static const char CS, SF, SR, VB, *BL;	4	static const char CS, SF, SR, VB, *BL;
5	static const char VE, VI, KS, KE;	5	static const char VE, VI, KS, KE;
6	static const char CD, CL, IC, DC;	6	static const char CD, CL, IC, DC;




--- 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
 }
 




--- 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
-#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
 }
 

Lines 1-10 Link Here

(-)pkg-plist (-7 / +1 lines)
1	@owner uucp	1	@(uucp,dialer,555) bin/minicom
2	@group dialer
3	@mode 4511
4	bin/minicom
5	@owner
6	@group
7	@mode
8	bin/xminicom	2	bin/xminicom
9	bin/runscript	3	bin/runscript
10	bin/ascii-xfr	4	bin/ascii-xfr

Return to bug 230753

Lines 1-6 Link Here

(-)files/patch-src-window.c (-3 / +3 lines)
1	--- src/window.c.orig 2010-12-12 14:56:25.000000000 +0100	1	--- src/window.c.orig 2010-12-12 13:56:25 UTC
2	+++ src/window.c 2011-12-28 16:07:59.000000000 +0100	2	+++ src/window.c
3	@@ -66,6 +66,7 @@ static const char CE, Al, Dl, AL, *D	3	@@ -66,6 +66,7 @@ static const char CE, Al, Dl, AL, *DL;
4	static const char CS, SF, SR, VB, *BL;	4	static const char CS, SF, SR, VB, *BL;
5	static const char VE, VI, KS, KE;	5	static const char VE, VI, KS, KE;
6	static const char CD, CL, IC, DC;	6	static const char CD, CL, IC, DC;

Lines 3-34 Link Here

(-)Makefile (-10 / +11 lines)
3		3
4	PORTNAME= minicom	4	PORTNAME= minicom
5	PORTVERSION= 2.7.1	5	PORTVERSION= 2.7.1
		6	PORTREVISION= 1
6	CATEGORIES= comms	7	CATEGORIES= comms
7	MASTER_SITES= https://alioth.debian.org/frs/download.php/file/4215/ \	8	MASTER_SITES= http://fossies.org/linux/misc/
8	http://alioth.debian.org/frs/download.php/file/4215/ \
9	http://fossies.org/linux/misc/
10		9
11	MAINTAINER= johans@FreeBSD.org	10	MAINTAINER= johans@FreeBSD.org
12	COMMENT= MS-DOS Telix serial communication program "workalike"	11	COMMENT= MS-DOS Telix serial communication program "workalike"
13		12
14	LICENSE= GPLv2+	13	LICENSE= GPLv2+
		14	LICENSE_FILE= ${WRKSRC}/COPYING
15		15
16	RUN_DEPENDS= lrz:comms/lrzsz	16	RUN_DEPENDS= lrz:comms/lrzsz
17		17
18	OPTIONS_DEFINE= DOCS NLS	18	USES= iconv ncurses
19	OPTIONS_SUB= yes
20	NLS_USES= gettext
21	NLS_CONFIGURE_ENABLE= nls
22		19
23	USES= iconv ncurses
24	CPPFLAGS+= -I${LOCALBASE}/include
25	LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} -lncurses
26	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
27	CONFIGURE_ARGS+= --enable-dfl-baud=57600 \	21	CONFIGURE_ARGS+= --enable-dfl-baud=57600 \
28	--sysconfdir=${PREFIX}/etc/minicom \	22	--sysconfdir=${PREFIX}/etc/minicom \
29	--enable-lock-dir=/var/spool/lock \	23	--enable-lock-dir=/var/spool/lock \
30	--enable-dfl-port=/dev/cuau0	24	--enable-dfl-port=/dev/cuau0
		25	CPPFLAGS+= -I${LOCALBASE}/include
		26	LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} -lncurses
31		27
		28	OPTIONS_DEFINE= DOCS NLS
		29	OPTIONS_SUB= yes
		30	NLS_USES= gettext
		31	NLS_CONFIGURE_ENABLE= nls
		32
32	post-patch:	33	post-patch:
33	${REINPLACE_CMD} -e "s@/usr/local/bin/@${LOCALBASE}/bin/@; \	34	${REINPLACE_CMD} -e "s@/usr/local/bin/@${LOCALBASE}/bin/@; \
34	s@/sz@/lsz@;s@/sb@/lsb@;s@/sx@/lsx@;s@/rz@/lrz@; \	35	s@/sz@/lsz@;s@/sb@/lsb@;s@/sx@/lsx@;s@/rz@/lrz@; \

Line 0 Link Here

(-)files/patch-src_sysdep1.c (+55 lines)
	1	--- src/sysdep1.c.orig 2009-12-12 15:47:47 UTC
	2	+++ src/sysdep1.c
	3	@@ -65,13 +65,13 @@ static void m_setrts(int fd)
	4	if (portfd_is_socket)
	5	return;
	6	#endif
	7	-#if defined(TIOCM_RTS) && defined(TIOCMODG)
	8	+#if defined(TIOCM_RTS) && defined(TIOCMGET)
	9	{
	10	int mcs=0;
	11
	12	- ioctl(fd, TIOCMODG, &mcs);
	13	+ ioctl(fd, TIOCMGET, &mcs);
	14	mcs \|= TIOCM_RTS;
	15	- ioctl(fd, TIOCMODS, &mcs);
	16	+ ioctl(fd, TIOCMSET, &mcs);
	17	}
	18	#endif
	19	}
	20	@@ -180,11 +180,11 @@ int m_getdcd(int fd)
	21	return portfd_is_connected;
	22	}
	23	#endif
	24	-#ifdef TIOCMODG
	25	+#ifdef TIOCMODGET
	26	{
	27	int mcs = 0;
	28
	29	- if (ioctl(fd, TIOCMODG, &mcs) < 0)
	30	+ if (ioctl(fd, TIOCMODGET, &mcs) < 0)
	31	return -1;
	32	return mcs & TIOCM_CAR ? 1 : 0;
	33	}
	34	@@ -227,8 +227,8 @@ void m_savestate(int fd)
	35	ioctl(fd, TIOCLGET, &lsw);
	36	# endif
	37	#endif
	38	-#ifdef TIOCMODG
	39	- ioctl(fd, TIOCMODG, &m_word);
	40	+#ifdef TIOCMGET
	41	+ ioctl(fd, TIOCMGET, &m_word);
	42	#endif
	43	}
	44
	45	@@ -252,8 +252,8 @@ void m_restorestate(int fd)
	46	ioctl(fd, TIOCLSET, &lsw);
	47	# endif
	48	#endif
	49	-#ifdef TIOCMODS
	50	- ioctl(fd, TIOCMODS, &m_word);
	51	+#ifdef TIOCMSET
	52	+ ioctl(fd, TIOCMSET, &m_word);
	53	#endif
	54	}
	55

Lines 1-55 Link Here

(-)files/patch-sysdep1.c (-55 lines)
1	--- src/sysdep1.c.orig 2009-12-12 16:47:47.000000000 +0100
2	+++ src/sysdep1.c 2011-12-28 16:07:59.000000000 +0100
3	@@ -65,13 +65,13 @@ static void m_setrts(int fd)
4	if (portfd_is_socket)
5	return;
6	#endif
7	-#if defined(TIOCM_RTS) && defined(TIOCMODG)
8	+#if defined(TIOCM_RTS) && defined(TIOCMGET)
9	{
10	int mcs=0;
11
12	- ioctl(fd, TIOCMODG, &mcs);
13	+ ioctl(fd, TIOCMGET, &mcs);
14	mcs \|= TIOCM_RTS;
15	- ioctl(fd, TIOCMODS, &mcs);
16	+ ioctl(fd, TIOCMSET, &mcs);
17	}
18	#endif
19	}
20	@@ -180,11 +180,11 @@ int m_getdcd(int fd)
21	return portfd_is_connected;
22	}
23	#endif
24	-#ifdef TIOCMODG
25	+#ifdef TIOCMODGET
26	{
27	int mcs = 0;
28
29	- if (ioctl(fd, TIOCMODG, &mcs) < 0)
30	+ if (ioctl(fd, TIOCMODGET, &mcs) < 0)
31	return -1;
32	return mcs & TIOCM_CAR ? 1 : 0;
33	}
34	@@ -227,8 +227,8 @@ void m_savestate(int fd)
35	ioctl(fd, TIOCLGET, &lsw);
36	# endif
37	#endif
38	-#ifdef TIOCMODG
39	- ioctl(fd, TIOCMODG, &m_word);
40	+#ifdef TIOCMGET
41	+ ioctl(fd, TIOCMGET, &m_word);
42	#endif
43	}
44
45	@@ -252,8 +252,8 @@ void m_restorestate(int fd)
46	ioctl(fd, TIOCLSET, &lsw);
47	# endif
48	#endif
49	-#ifdef TIOCMODS
50	- ioctl(fd, TIOCMODS, &m_word);
51	+#ifdef TIOCMSET
52	+ ioctl(fd, TIOCMSET, &m_word);
53	#endif
54	}
55