ed: Upgrade to v1.8

License files chenged but not the license type

Signed-off-by: Radu Moisan <radu.moisan@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>

3 files changed, 27 insertions, 71 deletions

diff --git a/meta/recipes-extended/ed/ed-1.7/ed-1.2-build.patch b/meta/recipes-extended/ed/ed-1.7/ed-1.2-build.patch
deleted file mode 100644
index d30b393364..0000000000
--- a/meta/recipes-extended/ed/ed-1.7/ed-1.2-build.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-http://lists.gnu.org/archive/html/bug-ed/2008-12/msg00001.html
-
-2007-04-16  Mike Frysinger  <vapier@gentoo.org>
-
-	* Do not set CC/CXX/CPPFLAGS/LDFLAGS to "" so that user can
-	  override if they so choose.
-	* Only set CFLAGS/CXXFLAGS if user did not specify any.
-
-ed had already taken GPLv3 when this patch out, so it should be GPLv3.
-Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
-
-Upstream-Status: Pending
-
-Index: ed-1.5/configure
-===================================================================
---- ed-1.5.orig/configure	2010-08-30 07:34:49.000000000 -0700
-+++ ed-1.5/configure	2010-11-20 16:42:20.490645823 -0800
-@@ -26,10 +26,6 @@
- mandir='$(datadir)/man'
- sysconfdir='$(prefix)/etc'
- program_prefix=
--CC=
--CPPFLAGS=
--CFLAGS='-Wall -W -O2'
--LDFLAGS=
- 
- # Loop over all args
- while [ -n "$1" ] ; do
-@@ -105,6 +101,14 @@
- 	esac
- done
- 
-+# Defaults if the user did not select any
-+if [ x"${CFLAGS+set}" != xset ] ; then
-+	CFLAGS='-Wall -W -O2'
-+fi
-+if [ x"${CXXFLAGS+set}" != xset ] ; then
-+	CXXFLAGS='-Wall -W -O2'
-+fi
-+
- # Find the source files, if location was not specified.
- srcdirtext=
- if [ -z "${srcdir}" ] ; then
diff --git a/meta/recipes-extended/ed/ed_1.7.bb b/meta/recipes-extended/ed/ed_1.7.bb
deleted file mode 100644
index 005743889b..0000000000
--- a/meta/recipes-extended/ed/ed_1.7.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "a line-oriented text editor"
-HOMEPAGE = "http://www.gnu.org/software/ed/"
-BUGTRACKER = ""
-
-LICENSE = "GPLv3+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
-                    file://ed.h;endline=20;md5=c708cda1b2e8d723d458690b7db03878 \
-                    file://main.c;endline=24;md5=1bd039d59e04ee5f82adcc970144a2c3"
-
-SECTION = "base"
-PR = "r0"
-
-# LSB states that ed should be in /bin/
-bindir = "${base_bindir}"
-
-SRC_URI = "${GNU_MIRROR}/ed/ed-${PV}.tar.gz \
-           file://ed-1.2-build.patch"
-
-SRC_URI[md5sum] = "0aa4e2428e325203d0d7c3e86c961b1c"
-SRC_URI[sha256sum] = "894241019a5ff2b7816d20c5bd5a7048fb8f336ca52e97b3cc88d45b16472031"
-
-do_configure() {
-	${S}/configure
-}
-
-do_install() {
-	oe_runmake 'DESTDIR=${D}' install
-}
diff --git a/meta/recipes-extended/ed/ed_1.8.bb b/meta/recipes-extended/ed/ed_1.8.bb
new file mode 100644
index 0000000000..c6b50752a5
--- /dev/null
+++ b/meta/recipes-extended/ed/ed_1.8.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "a line-oriented text editor"
+HOMEPAGE = "http://www.gnu.org/software/ed/"
+BUGTRACKER = ""
+
+LICENSE = "GPLv3+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
+                    file://ed.h;endline=20;md5=375a20cc2545ac1115eeb7b323c60ae3 \
+                    file://main.c;endline=24;md5=1b31246da5e3864d7b30094ff76bf7ed"
+
+SECTION = "base"
+PR = "r0"
+
+# LSB states that ed should be in /bin/
+bindir = "${base_bindir}"
+
+SRC_URI = "${GNU_MIRROR}/ed/ed-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "2268d2344b3c52d23730acb2e3c942fe"
+SRC_URI[sha256sum] = "64c138d33b1ea4b9daa88e045da0619e2a43cb99a9d378417d20163f410a7273"
+
+do_configure() {
+	${S}/configure
+}
+
+do_install() {
+	oe_runmake 'DESTDIR=${D}' install
+}