From f92b248d9640d6de1d5fbccb6acf0c3b60689dea Mon Sep 17 00:00:00 2001
From: Saul Wold <Saul.Wold@intel.com>
Date: Sat, 20 Nov 2010 17:09:10 -0800
Subject: ed: fix patch and LIC_FILES_CHKSUM

Signed-off-by: Saul Wold <Saul.Wold@intel.com>
---
 meta/recipes-extended/ed/ed-1.5/ed-1.2-build.patch | 16 +++++++---------
 meta/recipes-extended/ed/ed_1.5.bb                 |  4 ++--
 2 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'meta/recipes-extended/ed')

diff --git a/meta/recipes-extended/ed/ed-1.5/ed-1.2-build.patch b/meta/recipes-extended/ed/ed-1.5/ed-1.2-build.patch
index a65c433d57..4c92aa2ce4 100644
--- a/meta/recipes-extended/ed/ed-1.5/ed-1.2-build.patch
+++ b/meta/recipes-extended/ed/ed-1.5/ed-1.2-build.patch
@@ -9,24 +9,22 @@ http://lists.gnu.org/archive/html/bug-ed/2008-12/msg00001.html
 ed had already taken GPLv3 when this patch out, so it should be GPLv3.
 Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
 
-Index: ed-1.4/configure
+Index: ed-1.5/configure
 ===================================================================
---- ed-1.4.orig/configure	2009-07-10 19:54:33.000000000 +0800
-+++ ed-1.4/configure	2010-08-05 17:41:51.000000000 +0800
-@@ -26,12 +26,6 @@
+--- 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=
--CXX=
 -CPPFLAGS=
 -CFLAGS='-Wall -W -O2'
--CXXFLAGS='-Wall -W -O2'
 -LDFLAGS=
  
  # Loop over all args
- while [ x"$1" != x ] ; do
-@@ -111,6 +105,14 @@
+ while [ -n "$1" ] ; do
+@@ -105,6 +101,14 @@
  	esac
  done
  
@@ -40,4 +38,4 @@ Index: ed-1.4/configure
 +
  # Find the source files, if location was not specified.
  srcdirtext=
- if [ x"${srcdir}" = x ] ; then
+ if [ -z "${srcdir}" ] ; then
diff --git a/meta/recipes-extended/ed/ed_1.5.bb b/meta/recipes-extended/ed/ed_1.5.bb
index 0243769e90..2242ffa663 100644
--- a/meta/recipes-extended/ed/ed_1.5.bb
+++ b/meta/recipes-extended/ed/ed_1.5.bb
@@ -4,8 +4,8 @@ BUGTRACKER = ""
 
 LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
-                    file://ed.h;endline=20;md5=294d5da73d15cd444ca2260fa2538296 \
-                    file://main.c;endline=24;md5=122be7f2751ae819c803441972c7f45b"
+                    file://ed.h;endline=20;md5=238781cd8e436dabb0e9f18443400066 \
+                    file://main.c;endline=24;md5=177fe82d0649e545591a13fdce5733e8"
 
 SECTION = "base"
 PR = "r0"
-- 
cgit v1.2.3-54-g00ecf