picocom: update to 2.1

4 files changed, 25 insertions, 122 deletions

diff --git a/package/picocom/Makefile b/package/picocom/Makefile
index 60251e21e..6e06e23b7 100644
--- a/package/picocom/Makefile
+++ b/package/picocom/Makefile
@@ -4,15 +4,15 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		picocom
-PKG_VERSION:=		14288582f10e662732c32eb67ab49b64fd6206c2
+PKG_VERSION:=		2.1
 PKG_RELEASE:=		1
-PKG_GIT:=		hash
+PKG_HASH:=		6b152fc5f816eaef6b86336a4cec7cf1496b7c712061e5aea5a36f143a0b09ed
 PKG_DESCR:=		minimal dumb-terminal emulation program
 PKG_SECTION:=		sys/serial
 PKG_URL:=		https://github.com/npat-efault/picocom/
-PKG_SITES:=		https://github.com/npat-efault/picocom.git
+PKG_SITES:=		https://github.com/npat-efault/picocom/archive/
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:=		${PKG_VERSION}.tar.gz
 
 include ${ADK_TOPDIR}/mk/package.mk
 
diff --git a/package/picocom/patches/patch-Makefile b/package/picocom/patches/patch-Makefile
index 6c08b9d12..5d6911113 100644
--- a/package/picocom/patches/patch-Makefile
+++ b/package/picocom/patches/patch-Makefile
@@ -1,20 +1,18 @@
---- picocom-1.7.orig/Makefile	2012-02-21 06:42:24.000000000 +0100
-+++ picocom-1.7/Makefile	2013-12-26 09:43:38.000000000 +0100
-@@ -4,13 +4,14 @@ VERSION=1.7
- UUCP_LOCK_DIR=/var/lock
+--- picocom-2.1.orig/Makefile	2015-10-15 23:25:02.000000000 +0200
++++ picocom-2.1/Makefile	2016-09-23 15:45:44.240688077 +0200
+@@ -1,12 +1,12 @@
  
- # CC = gcc
--CPPFLAGS=-DVERSION_STR=\"$(VERSION)\" \
-+CPPFLAGS ?=
-+CPPFLAGS+=-DVERSION_STR=\"$(VERSION)\" \
-          -DUUCP_LOCK_DIR=\"$(UUCP_LOCK_DIR)\" \
-          -DHIGH_BAUD
+ VERSION = 2.1
+ 
+-#CC = gcc
++CC ?= gcc
+ CPPFLAGS = -DVERSION_STR=\"$(VERSION)\"
 -CFLAGS = -Wall -g
 +CFLAGS ?= -Wall -g
  
- # LD = gcc
+ LD = $(CC)
 -LDFLAGS = -g
 +LDFLAGS ?= -g
  LDLIBS =
  
- picocom : picocom.o term.o
+ all: picocom
diff --git a/package/picocom/patches/patch-linenoise-1_0_Makefile b/package/picocom/patches/patch-linenoise-1_0_Makefile
new file mode 100644
index 000000000..d7c7a6526
--- /dev/null
+++ b/package/picocom/patches/patch-linenoise-1_0_Makefile
@@ -0,0 +1,11 @@
+--- picocom-2.1.orig/linenoise-1.0/Makefile	2015-10-15 23:25:02.000000000 +0200
++++ picocom-2.1/linenoise-1.0/Makefile	2016-09-23 15:44:57.086909523 +0200
+@@ -1,7 +1,7 @@
+ linenoise_example: linenoise.h linenoise.c
+ 
+ linenoise_example: linenoise.c example.c
+-	$(CC) -Wall -W -Os -g -o linenoise_example linenoise.c example.c
++	$(CC) $(CFLAGS) -o linenoise_example linenoise.c example.c
+ 
+ clean:
+ 	rm -f linenoise_example
diff --git a/package/picocom/patches/patch-term_c b/package/picocom/patches/patch-term_c
deleted file mode 100644
index 6ed95ab65..000000000
--- a/package/picocom/patches/patch-term_c
+++ /dev/null
@@ -1,106 +0,0 @@
---- picocom-1.7.orig/term.c	2010-05-29 00:41:19.000000000 +0200
-+++ picocom-1.7/term.c	2013-12-26 09:45:20.000000000 +0100
-@@ -33,11 +33,7 @@
- #include <string.h>
- #include <errno.h>
- #include <unistd.h>
--#ifdef __linux__
--#include <termio.h>
--#else
- #include <termios.h>
--#endif /* of __linux__ */
- 
- #include "term.h"
- 
-@@ -945,27 +941,6 @@ term_pulse_dtr (int fd)
- 			break;
- 		}
- 
--#ifdef __linux__
--		{
--			int opins = TIOCM_DTR;
--
--			r = ioctl(fd, TIOCMBIC, &opins);
--			if ( r < 0 ) {
--				term_errno = TERM_EDTRDOWN;
--				rval = -1;
--				break;
--			}
--
--			sleep(1);
--
--			r = ioctl(fd, TIOCMBIS, &opins);
--			if ( r < 0 ) {
--				term_errno = TERM_EDTRUP;
--				rval = -1;
--				break;
--			}
--		}
--#else
- 		{
- 			struct termios tio, tioold;
- 
-@@ -997,8 +972,6 @@ term_pulse_dtr (int fd)
- 				break;
- 			}
- 		}
--#endif /* of __linux__ */
--			
- 	} while (0);
- 
- 	return rval;
-@@ -1020,19 +993,6 @@ term_raise_dtr(int fd)
- 			rval = -1;
- 			break;
- 		}
--
--#ifdef __linux__
--		{
--			int opins = TIOCM_DTR;
--
--			r = ioctl(fd, TIOCMBIS, &opins);
--			if ( r < 0 ) {
--				term_errno = TERM_EDTRUP;
--				rval = -1;
--				break;
--			}
--		}
--#else
- 		r = tcsetattr(fd, TCSANOW, &term.currtermios[i]);
- 		if ( r < 0 ) {
- 			/* FIXME: perhaps try to update currtermios */
-@@ -1040,7 +1000,6 @@ term_raise_dtr(int fd)
- 			rval = -1;
- 			break;
- 		}
--#endif /* of __linux__ */
- 	} while (0);
- 
- 	return rval;
-@@ -1064,18 +1023,6 @@ term_lower_dtr(int fd)
- 			break;
- 		}
- 
--#ifdef __linux__
--		{
--			int opins = TIOCM_DTR;
--
--			r = ioctl(fd, TIOCMBIC, &opins);
--			if ( r < 0 ) {
--				term_errno = TERM_EDTRDOWN;
--				rval = -1;
--				break;
--			}
--		}
--#else
- 		{
- 			struct termios tio;
- 
-@@ -1097,7 +1044,6 @@ term_lower_dtr(int fd)
- 				break;
- 			}
- 		}
--#endif /* of __linux__ */
- 	} while (0);
- 	
- 	return rval;