From c4b96b36f61f6aded2fba015a4e636d075acc34c Mon Sep 17 00:00:00 2001
From: Nagy Karoly Gabriel <karasz@opensde.org>
Date: Mon, 24 Nov 2008 23:21:41 +0200
Subject: [PATCH] ed: Updated (0.2 -> 1.1) yes, ed is alive, also removed patch
 and unneded ed.conf

---
 base/ed/destdir.patch | 47 -------------------------------------------
 base/ed/ed.conf       | 24 ----------------------
 base/ed/ed.desc       |  6 +++---
 3 files changed, 3 insertions(+), 74 deletions(-)
 delete mode 100644 base/ed/destdir.patch
 delete mode 100644 base/ed/ed.conf

diff --git a/base/ed/destdir.patch b/base/ed/destdir.patch
deleted file mode 100644
index 4c76846e6..000000000
--- a/base/ed/destdir.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../ed/destdir.patch
-# Copyright (C) 2006 The OpenSDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
---- ./Makefile.in.orig	2006-08-03 21:12:43.000000000 +0000
-+++ ./Makefile.in	2006-08-03 21:30:05.000000000 +0000
-@@ -99,20 +99,18 @@
- 	$(TEXI2DVI) $(srcdir)/ed.texinfo
- 
- install: ed ed.info installdirs
--	$(INSTALL_PROGRAM) ed $(bindir)/$(binprefix)ed
--	rm -f $(bindir)/$(binprefix)red
--	cd $(bindir); \
--	  $(LN_S) $(binprefix)ed $(binprefix)red
--	$(INSTALL_DATA) $(srcdir)/ed.info $(infodir)/$(binprefix)ed.info
--	$(INSTALL_DATA) $(srcdir)/ed.1 $(mandir)/$(binprefix)ed$(manext)
--	rm -f $(mandir)/$(binprefix)red$(manext)
--	cd $(mandir); \
--	  $(LN_S) $(binprefix)ed$(manext) $(binprefix)red$(manext)
-+	$(INSTALL_PROGRAM) ed $(DESTDIR)$(bindir)/$(binprefix)ed
-+	rm -f $(DESTDIR)$(bindir)/$(binprefix)red
-+	$(LN_S) $(binprefix)ed $(DESTDIR)$(bindir)/$(binprefix)red
-+	$(INSTALL_DATA) $(srcdir)/ed.info $(DESTDIR)$(infodir)/$(binprefix)ed.info
-+	$(INSTALL_DATA) $(srcdir)/ed.1 $(DESTDIR)$(mandir)/$(binprefix)ed$(manext)
-+	rm -f $(DESTDIR)$(mandir)/$(binprefix)red$(manext)
-+	$(LN_S) $(binprefix)ed$(manext) $(DESTDIR)$(mandir)/$(binprefix)red$(manext)
- 
- # Make sure all installation directories, e.g. $(bindir) actually exist by
- # making them if necessary.
- installdirs:
--	$(srcdir)/mkinstalldirs $(bindir) $(infodir) $(mandir)
-+	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(infodir) $(DESTDIR)$(mandir)
- 
- uninstall: all
- 	rm -f $(bindir)/$(binprefix)ed $(bindir)/$(binprefix)red
diff --git a/base/ed/ed.conf b/base/ed/ed.conf
deleted file mode 100644
index 355c5ce4e..000000000
--- a/base/ed/ed.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../ed/ed.conf
-# Copyright (C) 2004 - 2006 The T2 SDE Project
-# Copyright (C) 1998 - 2003 Clifford Wolf
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
-
-fix_usrbin_bin() {
-	[ -f $root/usr/bin/ed ] &&
-		mv -vf $root/usr/bin/ed $root/bin/ed
-	[ -L $root/usr/bin/red ] &&
-		ln -svf /bin/ed $root/usr/bin/red
-}
-
-hook_add postmake 5 "fix_usrbin_bin"
diff --git a/base/ed/ed.desc b/base/ed/ed.desc
index 33df370d1..12295b216 100644
--- a/base/ed/ed.desc
+++ b/base/ed/ed.desc
@@ -3,7 +3,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../ed/ed.desc
-[COPY] Copyright (C) 2006 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2008 The OpenSDE Project
 [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
 [COPY] Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY]
@@ -31,8 +31,8 @@
 
 [L] GPL
 [S] Stable
-[V] 0.2
+[V] 1.1
 [P] X -----5---9 109.700
 
-[D] 3361941979 ed-0.2.tar.gz ftp://ftp.gnu.org/pub/gnu/ed/
+[D] 3717674529 ed-1.1.tar.bz2 ftp://ftp.gnu.org/pub/gnu/ed/