Upgraded to readline 6.0, which I believe to be ABI compatible with 5.2 (and when I'm proved wrong I will /make/ it be, as I believe that is /correct/).

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

6 files changed, 13 insertions, 44 deletions

diff --git a/data/readline/_metadata/license b/data/readline/_metadata/license
index 9c13a9a0f..af4224931 120000
--- a/data/readline/_metadata/license
+++ b/data/readline/_metadata/license
@@ -1 +1 @@
-../../../licenses/gpl-2
\ No newline at end of file
+../../../licenses/gpl-3
\ No newline at end of file
diff --git a/data/readline/_metadata/version b/data/readline/_metadata/version
index ef425ca98..e0ea36fee 100644
--- a/data/readline/_metadata/version
+++ b/data/readline/_metadata/version
@@ -1 +1 @@
-5.2
+6.0
diff --git a/data/readline/archarm.diff b/data/readline/archarm.diff
index 40d3a909f..39c4ccb01 100644
--- a/data/readline/archarm.diff
+++ b/data/readline/archarm.diff
@@ -1,48 +1,13 @@
-diff -ru readline-5.2/support/shobj-conf readline-5.2+iPhone/support/shobj-conf
---- readline-5.2/support/shobj-conf	2006-04-11 13:15:43.000000000 +0000
-+++ readline-5.2+iPhone/support/shobj-conf	2007-12-28 14:22:45.000000000 +0000
-@@ -142,42 +142,19 @@
- 	;;
- 
- # Darwin/MacOS X
--darwin8*)
-+darwin*|macosx*)
- 	SHOBJ_STATUS=supported
- 	SHLIB_STATUS=supported
- 	
- 	SHOBJ_CFLAGS='-fno-common'
- 
--	SHOBJ_LD='MACOSX_DEPLOYMENT_TARGET=10.3 ${CC}'
--
--	SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)'
--	SHLIB_LIBSUFF='dylib'
--
--	SHOBJ_LDFLAGS='-undefined dynamic_lookup'
--	SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
--
--	SHLIB_LIBS='-lncurses'	# see if -lcurses works on MacOS X 10.1 
--	;;
--
--darwin*|macosx*)
--	SHOBJ_STATUS=unsupported
--	SHLIB_STATUS=supported
--
--	SHOBJ_CFLAGS='-fno-common'
--
- 	SHOBJ_LD='${CC}'
- 
+diff -ru readline-6.0/support/shobj-conf readline-6.0+iPhone/support/shobj-conf
+--- readline-6.0/support/shobj-conf	2009-01-04 19:32:42.000000000 +0000
++++ readline-6.0+iPhone/support/shobj-conf	2009-04-09 02:24:20.000000000 +0000
+@@ -157,8 +157,8 @@
  	SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)'
  	SHLIB_LIBSUFF='dylib'
  
--	case "${host_os}" in
--	darwin[78]*)	SHOBJ_LDFLAGS=''
--			SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
--			;;
--	*)		SHOBJ_LDFLAGS='-dynamic'
--			SHLIB_XLDFLAGS='-arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
--			;;
--	esac
-+	SHOBJ_LDFLAGS='-undefined dynamic_lookup'
+-	SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup -arch_only `/usr/bin/arch`'
+-	SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
++	SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup -arch_only arm'
 +	SHLIB_XLDFLAGS='-dynamiclib -arch_only arm -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
  
  	SHLIB_LIBS='-lncurses'	# see if -lcurses works on MacOS X 10.1 
diff --git a/data/readline/make.sh b/data/readline/make.sh
index 3eab9f214..835b499f7 100644
--- a/data/readline/make.sh
+++ b/data/readline/make.sh
@@ -2,3 +2,7 @@ pkg:setup
 pkg:configure ac_cv_func_strcoll_works=yes bash_cv_func_sigsetjmp=present bash_cv_func_ctype_nonascii=no bash_cv_must_reinstall_sighandlers=no bash_cv_func_strcoll_broken=yes
 make
 pkg:install
+pkg: ln -s libreadline.6.dylib /usr/lib/libreadline.5.dylib
+pkg: ln -s libreadline.6.0.dylib /usr/lib/libreadline.5.2.dylib
+pkg: ln -s libhistory.6.dylib /usr/lib/libhistory.5.dylib
+pkg: ln -s libhistory.6.0.dylib /usr/lib/libhistory.5.2.dylib
diff --git a/data/readline/readline-5.2.tar.gz b/data/readline/readline-5.2.tar.gz
deleted file mode 100644
index 5f3ac6052..000000000
--- a/data/readline/readline-5.2.tar.gz
+++ /dev/null
diff --git a/data/readline/readline-6.0.tar.gz b/data/readline/readline-6.0.tar.gz
new file mode 100644
index 000000000..3d3f6bded
--- /dev/null
+++ b/data/readline/readline-6.0.tar.gz