zsh: Change from 4.3.17 to 5.0.0, which is the latest stable release. Also change...

The reason for removing the 4.3.17 recipe is that it used the ftp mirror, which
has removed the 4.3.17 tarbal used.

(From meta-openembedded rev: 4cfe58d3ce694ee2951a0ed0e855c6e4dbca2dc2)

Signed-off-by: Martin Ertsaas <mertsas@cisco.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-openembedded/meta-oe/recipes-extended/zsh/zsh_4.3.17.bb b/meta-openembedded/meta-oe/recipes-extended/zsh/zsh.inc
similarity index 56%
rename from meta-openembedded/meta-oe/recipes-extended/zsh/zsh_4.3.17.bb
rename to meta-openembedded/meta-oe/recipes-extended/zsh/zsh.inc
index 9192f20..cacce91 100644 (file)
--- a/meta-openembedded/meta-oe/recipes-extended/zsh/zsh_4.3.17.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/zsh/zsh.inc
@@ -2,50 +2,54 @@ DESCRIPTION = "UNIX Shell similar to the Korn shell"
 HOMEPAGE="http://www.zsh.org"
 SECTION = "base/shell"
 
+PR = "r0"
+
 LICENSE = "ZSH"
 LIC_FILES_CHKSUM = "file://LICENCE;md5=ad234d4b46db63491c4a9789da4fb341"
 
-DEPENDS = "ncurses libcap libpcre gdbm groff-native"
+DEPENDS = "ncurses bison-native"
 
-SRC_URI = "ftp://ftp.zsh.org/pub/${P}.tar.bz2"
-SRC_URI[md5sum] = "8258967060b2654f30001a011946ac6a"
-SRC_URI[sha256sum] = "054e0452afd9c742c9f1489465175e1d4d7db50d88b602d132551d850cf7a704"
+SRC_URI = "http://downloads.sourceforge.net/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz"
 
-FILES_${PN}-dbg += "\
-    ${libdir}/${PN}/${PV}/${PN}/.debug/*.so \
-    ${libdir}/${PN}/${PV}/${PN}/db/.debug/*.so \
-    ${libdir}/${PN}/${PV}/${PN}/net/.debug/*.so \
-    "
-
-inherit autotools
+inherit autotools gettext update-alternatives
 
 EXTRA_OECONF = " \
     --bindir=${base_bindir} \
     --enable-etcdir=${sysconfdir} \
     --enable-fndir=${datadir}/${PN}/${PV}/functions \
     --enable-site-fndir=${datadir}/${PN}/site-functions \
-    --enable-function-subdirs \
     --with-term-lib='ncursesw ncurses' \
     --with-tcsetpgrp \
-    --enable-pcre \
     --enable-cap \
     --enable-multibyte \
-    --enable-gdbm \
-    --enable-dynamic \
+    --disable-gdbm \
+    --disable-dynamic \
     zsh_cv_shared_environ=yes \
     "
 
+ALTERNATIVE_${PN} = "sh"
+ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh"
+ALTERNATIVE_TARGET[sh] = "${base_bindir}/${BPN}"
+ALTERNATIVE_PRIORITY = "100"
+
+export AUTOHEADER = "true"
+
 do_configure () {
     oe_runconf
 }
 
+do_install_append () {
+    rm -fr ${D}/usr/share
+}
+
 pkg_postinst_${PN} () {
     touch $D${sysconfdir}/shells
-    grep -q "bin/zsh" $D${sysconfdir}/shells || echo "/bin/zsh" >> $D${sysconfdir}/shells
+    grep -q "bin/zsh" $D${sysconfdir}/shells || echo /bin/zsh >> $D${sysconfdir}/shells
+    grep -q "bin/sh" $D${sysconfdir}/shells || echo /bin/sh >> $D${sysconfdir}/shells
 }
 
-pkg_postrm_${PN} () {
-    if [ -e $D${sysconfdir}/shells ]; then
-        sed -i -e '/\/bin\/zsh/d' $D${sysconfdir}/shells
-    fi
-}
+FILES_${PN}-dbg += "\
+    ${libdir}/${PN}/${PV}/${PN}/.debug/*.so \
+    ${libdir}/${PN}/${PV}/${PN}/db/.debug/*.so \
+    ${libdir}/${PN}/${PV}/${PN}/net/.debug/*.so \
+    "

diff --git a/meta-openembedded/meta-oe/recipes-extended/zsh/zsh_5.0.0.bb b/meta-openembedded/meta-oe/recipes-extended/zsh/zsh_5.0.0.bb
new file mode 100644 (file)
index 0000000..3421d95
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-extended/zsh/zsh_5.0.0.bb
@@ -0,0 +1,5 @@
+require zsh.inc
+DEPENDS = "ncurses libcap libpcre gdbm groff-native"
+
+SRC_URI[md5sum] = "01df38e4aa34aa227462fdf2f6d4c5cd"
+SRC_URI[sha256sum] = "835194ea83abd812b5fdb1d2bfa6427c4c4e95e771c4a75e9006037af8efd264"