From 6774b86da56c1713247148e83d44630675828dee Mon Sep 17 00:00:00 2001 From: Jay Freeman Date: Wed, 8 Apr 2009 21:39:43 +0000 Subject: 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 --- data/ncurses/_metadata/preinst.c | 16 ++++++++++++++++ data/ncurses/_metadata/prerm.c | 26 ++++++++++++++++++++++++++ data/ncurses/_metadata/version | 2 +- data/ncurses/install.diff | 12 ------------ data/ncurses/make.sh | 8 ++++++++ data/ncurses/ncurses-5.6.tar.gz | Bin 2402592 -> 0 bytes data/ncurses/ncurses-5.7.tar.gz | Bin 0 -> 2445052 bytes data/ncurses/xopen.diff | 18 ++++++++++++++++++ 8 files changed, 69 insertions(+), 13 deletions(-) create mode 100644 data/ncurses/_metadata/preinst.c create mode 100644 data/ncurses/_metadata/prerm.c delete mode 100644 data/ncurses/install.diff delete mode 100644 data/ncurses/ncurses-5.6.tar.gz create mode 100644 data/ncurses/ncurses-5.7.tar.gz create mode 100644 data/ncurses/xopen.diff (limited to 'data/ncurses') 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 +#include + +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 +#include + +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 Binary files a/data/ncurses/ncurses-5.6.tar.gz and /dev/null differ 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 Binary files /dev/null and b/data/ncurses/ncurses-5.7.tar.gz differ 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) > $@ -- cgit v1.2.3