From 5e1e636abf67f071b0e19ef3ff8303e50926101a Mon Sep 17 00:00:00 2001
From: "\"Steven J. Hill\"" <sjhill@realitydiluted.com>
Date: Thu, 5 Jul 2007 17:52:31 +0000
Subject: [PATCH] Update version of ed and remove obsoleted patch. Submitted by
 <buraphalinuxserver@gmail.com>.

---
 package/ed/ed-configure-CPP.patch | 14 --------------
 package/ed/ed.mk                  | 19 +++++--------------
 2 files changed, 5 insertions(+), 28 deletions(-)
 delete mode 100644 package/ed/ed-configure-CPP.patch

diff --git a/package/ed/ed-configure-CPP.patch b/package/ed/ed-configure-CPP.patch
deleted file mode 100644
index fb6f4897d5..0000000000
--- a/package/ed/ed-configure-CPP.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-this old configure script has broken CPP logic is CPP is set in the
-host environment
-
---- ed-0.2/configure
-+++ ed-0.2/configure
-@@ -731,6 +731,8 @@
- rm -f conftest*
-   ac_cv_prog_CPP="$CPP"
- fi
-+else
-+  ac_cv_prog_CPP="$CPP"
- fi
- CPP="$ac_cv_prog_CPP"
- echo "$ac_t""$CPP" 1>&4
diff --git a/package/ed/ed.mk b/package/ed/ed.mk
index da257c1b51..34ae1bc5f7 100644
--- a/package/ed/ed.mk
+++ b/package/ed/ed.mk
@@ -3,28 +3,19 @@
 # ed
 #
 #############################################################
-ED_SOURCE:=ed_0.2.orig.tar.gz
-ED_PATCH:=ed_0.2-20.diff.gz
-ED_SITE:=http://ftp.debian.org/debian/pool/main/e/ed
-ED_CAT:=$(ZCAT)
-ED_DIR:=$(BUILD_DIR)/ed-0.2
+ED_VERSION:=0.6
+ED_SOURCE:=ed-$(ED_VERSION).tar.bz2
+ED_SITE:=http://ftp.gnu.org/gnu/ed/
+ED_CAT:=$(BZCAT)
+ED_DIR:=$(BUILD_DIR)/ed-$(ED_VERSION)
 ED_BINARY:=ed
 ED_TARGET_BINARY:=bin/ed
 
 $(DL_DIR)/$(ED_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(ED_SITE)/$(ED_SOURCE)
 
-$(DL_DIR)/$(ED_PATCH):
-	 $(WGET) -P $(DL_DIR) $(ED_SITE)/$(ED_PATCH)
-
-ed-source: $(DL_DIR)/$(ED_SOURCE) $(DL_DIR)/$(ED_PATCH)
-
 $(ED_DIR)/.unpacked: $(DL_DIR)/$(ED_SOURCE) $(DL_DIR)/$(ED_PATCH)
 	$(ED_CAT) $(DL_DIR)/$(ED_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(ED_DIR) $(DL_DIR) $(ED_PATCH)
-	if [ -d $(ED_DIR)/debian/patches ]; then \
-		toolchain/patch-kernel.sh $(ED_DIR) $(ED_DIR)/debian/patches \*.patch ; \
-	fi
 	toolchain/patch-kernel.sh $(ED_DIR) package/ed/ ed-\*.patch
 	touch $@
 
-- 
2.30.2