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

19 files changed, 135 insertions, 19 deletions

diff --git a/data/ncurses/_metadata/preinst.c b/data/ncurses/_metadata/preinst.c
new file mode 100644
index 000000000..2c33ad71d
--- /dev/null
+++ b/data/ncurses/_metadata/preinst.c
@@ -0,0 +1,16 @@
+#include <string.h>
+#include <unistd.h>
+
+int main(int argc, char *argv[]) {
+    if (argc < 2 || (
+        strcmp(argv[1], "install") != 0 && (
+            strcmp(argv[1], "upgrade") != 0 ||
+            strncmp(argv[2], "5.6-", 4) != 0
+    ))) return 0;
+
+    unlink("/usr/lib/_ncurses");
+    if (symlink("/usr/lib/", "/usr/lib/_ncurses") != 0)
+        return 1;
+
+    return 0;
+}
diff --git a/data/ncurses/_metadata/prerm.c b/data/ncurses/_metadata/prerm.c
new file mode 100644
index 000000000..1bcb72a4c
--- /dev/null
+++ b/data/ncurses/_metadata/prerm.c
@@ -0,0 +1,26 @@
+#include <string.h>
+#include <unistd.h>
+
+int main(int argc, char *argv[]) {
+    if (argc < 2 || (
+        strcmp(argv[1], "remove") != 0
+    )) return 0;
+
+    if (unlink("/usr/lib/_ncurses") == -1)
+        return 1;
+
+    if (mkdir("/usr/lib/_ncurses", 0755) == -1) {
+        symlink("/usr/lib/", "/usr/lib/_ncurses");
+        return 2;
+    }
+
+    rename("/usr/lib/libcurses.dylib", "/usr/lib/_ncurses/libcurses.dylib");
+    rename("/usr/lib/libncurses.dylib", "/usr/lib/_ncurses/libncurses.dylib");
+
+    if (access("/usr/lib/libcurses.dylib", F_OK) != 0)
+        symlink("libncurses.5.4.dylib", "/usr/lib/libcurses.dylib");
+    if (access("/usr/lib/libncurses.dylib", F_OK) != 0)
+        symlink("libncurses.5.4.dylib", "/usr/lib/libncurses.dylib");
+
+    return 0;
+}
diff --git a/data/ncurses/_metadata/version b/data/ncurses/_metadata/version
index 2df33d769..760606e1f 100644
--- a/data/ncurses/_metadata/version
+++ b/data/ncurses/_metadata/version
@@ -1 +1 @@
-5.6
+5.7
diff --git a/data/ncurses/install.diff b/data/ncurses/install.diff
deleted file mode 100644
index 0f5dd5bf5..000000000
--- a/data/ncurses/install.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru ncurses-5.6/configure ncurses-5.6+iPhone/configure
---- ncurses-5.6/configure	2006-12-17 16:33:38.000000000 +0000
-+++ ncurses-5.6+iPhone/configure	2008-02-23 11:27:37.000000000 +0000
-@@ -4922,7 +4922,7 @@
- 	darwin*)
- 		EXTRA_CFLAGS="-no-cpp-precomp"
- 		CC_SHARED_OPTS="-dynamic"
--		MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${DESTDIR}${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
-+		MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
- 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
- 		cf_cv_shlib_version_infix=yes
- 		echo "$as_me:4928: checking if ld -search_paths_first works" >&5
diff --git a/data/ncurses/make.sh b/data/ncurses/make.sh
index a16febfea..5aba0cfcc 100644
--- a/data/ncurses/make.sh
+++ b/data/ncurses/make.sh
@@ -13,6 +13,14 @@ PKG_CONF=../${dir}/configure pkg:configure ${flags} --disable-overwrite --enable
 make
 pkg:install
 
+pkg: mkdir -p @/usr/lib
+pkg: cp -aL /usr/lib/libcurses.dylib @/usr/lib/libcurses.dylib
+pkg: cp -aL /usr/lib/libncurses.dylib @/usr/lib/libncurses.dylib
+
+pkg: mkdir -p /usr/lib/_ncurses
+pkg: mv /usr/lib/lib{,n}curses.dylib /usr/lib/_ncurses/
+pkg: rm -f /usr/lib/*.a
+
 for ti in "${PKG_DEST}"/usr/share/terminfo/*/*; do
     if [[ ${ti} == */@(?(pc)ansi|cons25|cygwin|dumb|linux|mach|rxvt|screen|sun|vt@(52|100|102|220)|swvt25?(m)|[Ex]term)?(-*) ]]; then
         echo "keeping terminfo: ${ti}"
diff --git a/data/ncurses/ncurses-5.6.tar.gz b/data/ncurses/ncurses-5.6.tar.gz
deleted file mode 100644
index 427a2230e..000000000
--- a/data/ncurses/ncurses-5.6.tar.gz
+++ /dev/null
diff --git a/data/ncurses/ncurses-5.7.tar.gz b/data/ncurses/ncurses-5.7.tar.gz
new file mode 100644
index 000000000..d6916072d
--- /dev/null
+++ b/data/ncurses/ncurses-5.7.tar.gz
diff --git a/data/ncurses/xopen.diff b/data/ncurses/xopen.diff
new file mode 100644
index 000000000..febad3b98
--- /dev/null
+++ b/data/ncurses/xopen.diff
@@ -0,0 +1,18 @@
+diff -ru ncurses-5.7/ncurses/Makefile.in ncurses-5.7+iPhone/ncurses/Makefile.in
+--- ncurses-5.7/ncurses/Makefile.in	2008-10-18 14:11:54.000000000 +0000
++++ ncurses-5.7+iPhone/ncurses/Makefile.in	2009-04-08 13:08:06.000000000 +0000
+@@ -197,12 +197,12 @@
+ make_keys$(BUILD_EXEEXT) : \
+ 		$(tinfo)/make_keys.c \
+ 		names.c
+-	$(BUILD_CC) -o $@ $(BUILD_CCFLAGS) $(tinfo)/make_keys.c $(BUILD_LDFLAGS) $(BUILD_LIBS)
++	$(BUILD_CC) -o $@ $(BUILD_CCFLAGS) $(tinfo)/make_keys.c $(BUILD_LDFLAGS) $(BUILD_LIBS) $(CPPFLAGS)
+ 
+ make_hash$(BUILD_EXEEXT) : \
+ 		$(tinfo)/comp_hash.c \
+ 		../include/hashsize.h
+-	$(BUILD_CC) -o $@ $(BUILD_CCFLAGS) -DMAIN_PROGRAM $(tinfo)/comp_hash.c $(BUILD_LDFLAGS) $(BUILD_LIBS)
++	$(BUILD_CC) -o $@ $(BUILD_CCFLAGS) -DMAIN_PROGRAM $(tinfo)/comp_hash.c $(BUILD_LDFLAGS) $(BUILD_LIBS) $(CPPFLAGS)
+ 
+ ./expanded.c : $(serial)/MKexpanded.sh
+ 	sh -e $(serial)/MKexpanded.sh "$(CPP)" $(CPPFLAGS) > $@
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
diff --git a/data/top/_metadata/libutil.dep b/data/top/_metadata/libutil.dep
deleted file mode 120000
index 828c65dfc..000000000
--- a/data/top/_metadata/libutil.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../libutil
\ No newline at end of file
diff --git a/data/top/_metadata/version b/data/top/_metadata/version
index 81b5c5d06..a2720097d 100644
--- a/data/top/_metadata/version
+++ b/data/top/_metadata/version
@@ -1 +1 @@
-37
+39
diff --git a/data/top/top-37.tar.gz b/data/top/top-37.tar.gz
deleted file mode 100644
index 685dc012a..000000000
--- a/data/top/top-37.tar.gz
+++ /dev/null
diff --git a/data/top/top-39.tar.gz b/data/top/top-39.tar.gz
new file mode 100644
index 000000000..d8b08261a
--- /dev/null
+++ b/data/top/top-39.tar.gz