screen: update to 5.0.0

4 files changed, 3 insertions, 61 deletions

diff --git a/package/screen/Makefile b/package/screen/Makefile
index 1756f3166..ce436e084 100644
--- a/package/screen/Makefile
+++ b/package/screen/Makefile
@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		screen
-PKG_VERSION:=		4.9.0
+PKG_VERSION:=		5.0.0
 PKG_RELEASE:=		1
-PKG_HASH:=		f9335281bb4d1538ed078df78a20c2f39d3af9a4e91c57d084271e0289c730f4
+PKG_HASH:=		f04a39d00a0e5c7c86a55338808903082ad5df4d73df1a2fd3425976aed94971
 PKG_DESCR:=		window manager for the terminal session
 PKG_SECTION:=		sys/utils
 PKG_DEPENDS:=		libncurses libelf
@@ -21,19 +21,7 @@ include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SCREEN,screen,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-AUTOTOOL_STYLE:=	autoreconf
-TARGET_LDFLAGS+=	-ltinfo
-CONFIGURE_ENV+=		$(foreach flag,rename fchmod fchown strerror lstat _exit utimes vsnprintf getcwd setlocale strftime,ac_cv_func_${flag}=yes)
-CONFIGURE_ARGS+=	--with-sys-screenrc=/etc/screenrc
-
-pre-build:
-	echo '#undef UTMPOK' >> ${WRKBUILD}/config.h
-	echo '#undef LOGINDEFAULT' >> ${WRKBUILD}/config.h
-	echo '#define LOGINDEFAULT 0' >> ${WRKBUILD}/config.h
-	echo '#undef GETUTENT' >> ${WRKBUILD}/config.h
-	echo '#undef UTHOST' >> ${WRKBUILD}/config.h
-	echo '#undef BUGGYGETLOGIN' >> ${WRKBUILD}/config.h
-	mv ${WRKBUILD}/sched.h ${WRKBUILD}/my_sched.h
+CONFIGURE_ARGS+=	--disable-pam
 
 screen-install:
 	${INSTALL_DIR} ${IDIR_SCREEN}/usr/bin
diff --git a/package/screen/patches/patch-pty_c b/package/screen/patches/patch-pty_c
deleted file mode 100644
index 90d5636b4..000000000
--- a/package/screen/patches/patch-pty_c
+++ /dev/null
@@ -1,15 +0,0 @@
---- screen-4.2.1.orig/pty.c	2014-04-26 12:58:35.000000000 +0200
-+++ screen-4.2.1/pty.c	2014-05-01 13:04:48.000000000 +0200
-@@ -39,9 +39,9 @@
- #endif
- 
- /* for solaris 2.1, Unixware (SVR4.2) and possibly others */
--#ifdef HAVE_STROPTS_H
--# include <sys/stropts.h>
--#endif
-+//#ifdef HAVE_STROPTS_H
-+//# include <sys/stropts.h>
-+//#endif
- 
- #if defined(sun) && defined(LOCKPTY) && !defined(TIOCEXCL)
- # include <sys/ttold.h>
diff --git a/package/screen/patches/patch-sched_h b/package/screen/patches/patch-sched_h
deleted file mode 100644
index 56508f1cd..000000000
--- a/package/screen/patches/patch-sched_h
+++ /dev/null
@@ -1,20 +0,0 @@
---- screen-4.2.1.orig/sched.h	2014-04-26 12:58:35.000000000 +0200
-+++ screen-4.2.1/sched.h	2014-05-01 13:04:48.000000000 +0200
-@@ -27,6 +27,11 @@
-  * $Id$ GNU
-  */
- 
-+#ifndef __SCHED_H
-+#define __SCHED_H
-+
-+#include <sys/time.h>
-+
- struct event
- {
-   struct event *next;
-@@ -46,3 +51,5 @@ struct event
- #define EV_READ		1
- #define EV_WRITE	2
- #define EV_ALWAYS	3
-+
-+#endif
diff --git a/package/screen/patches/patch-screen_h b/package/screen/patches/patch-screen_h
deleted file mode 100644
index ef6e5ea54..000000000
--- a/package/screen/patches/patch-screen_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- screen-4.2.1.orig/screen.h	2014-04-28 00:08:06.000000000 +0200
-+++ screen-4.2.1/screen.h	2015-02-19 02:36:51.299000393 +0100
-@@ -43,7 +43,7 @@
- #include "osdef.h"
- 
- #include "ansi.h"
--#include "sched.h"
-+#include "my_sched.h"
- #include "acls.h"
- #include "comm.h"
- #include "layer.h"