Upgraded ncurses (and with it screen and top); dropped Essential: (*phew*) and moved to pututxline().

git-svn-id: http://svn.telesphoreo.org/trunk@565 514c082c-b64e-11dc-b46d-3d985efe055d

7 files changed, 65 insertions, 4 deletions

diff --git a/data/screen/_metadata/libutil.dep b/data/screen/_metadata/libutil.dep
deleted file mode 120000
index 828c65dfc..000000000
--- a/data/screen/_metadata/libutil.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../libutil
\ No newline at end of file
diff --git a/data/screen/_metadata/ncurses.dep b/data/screen/_metadata/ncurses.dep
deleted file mode 120000
index a395fad08..000000000
--- a/data/screen/_metadata/ncurses.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../ncurses
\ No newline at end of file
diff --git a/data/screen/_metadata/version b/data/screen/_metadata/version
index 4d54daddb..c4e41f945 100644
--- a/data/screen/_metadata/version
+++ b/data/screen/_metadata/version
@@ -1 +1 @@
-4.0.2
+4.0.3
diff --git a/data/screen/make.sh b/data/screen/make.sh
index 58b56b640..bbe11381e 100644
--- a/data/screen/make.sh
+++ b/data/screen/make.sh
@@ -1,6 +1,6 @@
 pkg:setup
 autoconf
-pkg:configure --disable-pam --with-sys-screenrc=/etc/screenrc
+pkg:configure --disable-pam --with-sys-screenrc=/etc/screenrc ac_cv_header_dwarf_h=yes
 make
 pkg:install
 pkg: mkdir -p /etc
diff --git a/data/screen/screen-4.0.2.tar.gz b/data/screen/screen-4.0.2.tar.gz
deleted file mode 100644
index 9413a3546..000000000
--- a/data/screen/screen-4.0.2.tar.gz
+++ /dev/null
diff --git a/data/screen/screen-4.0.3.tar.gz b/data/screen/screen-4.0.3.tar.gz
new file mode 100644
index 000000000..860819d47
--- /dev/null
+++ b/data/screen/screen-4.0.3.tar.gz
diff --git a/data/screen/utmpx.diff b/data/screen/utmpx.diff
new file mode 100644
index 000000000..f2d2cc79f
--- /dev/null
+++ b/data/screen/utmpx.diff
@@ -0,0 +1,63 @@
+diff -ru screen-4.0.3/os.h screen-4.0.3+iPhone/os.h
+--- screen-4.0.3/os.h	2002-01-08 15:42:33.000000000 +0000
++++ screen-4.0.3+iPhone/os.h	2009-04-08 11:46:30.000000000 +0000
+@@ -260,7 +260,8 @@
+ #endif
+ 
+ #if defined(UTMPOK) || defined(BUGGYGETLOGIN)
+-# if defined(SVR4) && !defined(DGUX) && !defined(__hpux) && !defined(linux)
++# if defined(SVR4) && !defined(DGUX) && !defined(__hpux) && !defined(linux) || defined(__APPLE__)
++#  define _UTMPX_COMPAT
+ #  include <utmpx.h>
+ #  define UTMPFILE	UTMPX_FILE
+ #  define utmp		utmpx
+diff -ru screen-4.0.3/configure.in screen-4.0.3+iPhone/configure.in
+--- screen-4.0.3/configure.in	2003-06-03 11:58:24.000000000 +0000
++++ screen-4.0.3+iPhone/configure.in	2009-04-08 11:55:22.000000000 +0000
+@@ -815,9 +815,11 @@
+ AC_TRY_LINK([
+ #include <time.h> /* to get time_t on SCO */
+ #include <sys/types.h>
+-#if defined(SVR4) && !defined(DGUX)
++#if defined(SVR4) && !defined(DGUX) || defined(__APPLE__)
+ #include <utmpx.h>
+ #define utmp utmpx
++#define pututline pututxline
++#define getutent getutxent
+ #else
+ #include <utmp.h>
+ #endif
+@@ -832,9 +834,11 @@
+ AC_TRY_LINK([
+ #include <time.h>
+ #include <sys/types.h>
+-#if defined(SVR4) && !defined(DGUX)
++#if defined(SVR4) && !defined(DGUX) || defined(__APPLE__)
+ #include <utmpx.h>
+ #define utmp utmpx
++#define pututline pututxline
++#define getutent getutxent
+ #else
+ #include <utmp.h>
+ #endif
+@@ -848,7 +852,7 @@
+ AC_TRY_COMPILE([
+ #include <time.h>
+ #include <sys/types.h>
+-#if defined(SVR4) && !defined(DGUX)
++#if defined(SVR4) && !defined(DGUX) || defined(__APPLE__)
+ #include <utmpx.h>
+ #define utmp utmpx
+ #else
+diff -ru screen-4.0.3/utmp.c screen-4.0.3+iPhone/utmp.c
+--- screen-4.0.3/utmp.c	2003-09-08 14:27:17.000000000 +0000
++++ screen-4.0.3+iPhone/utmp.c	2009-04-08 12:01:35.000000000 +0000
+@@ -589,7 +589,7 @@
+ struct utmp *u;
+ {
+   u->ut_type = DEAD_PROCESS;
+-#if !defined(linux) || defined(EMPTY)
++#if (!defined(linux) || defined(EMPTY)) && !defined(__APPLE__)
+   u->ut_exit.e_termination = 0;
+   u->ut_exit.e_exit = 0;
+ #endif