sed fixes and other misc.

6 files changed, 81 insertions, 224 deletions

diff --git a/app-editors/fte/ChangeLog b/app-editors/fte/ChangeLog
index 7f3377bd953a..97e1effd5445 100644
--- a/app-editors/fte/ChangeLog
+++ b/app-editors/fte/ChangeLog
@@ -1,11 +1,18 @@
 # ChangeLog for app-editors/fte
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/ChangeLog,v 1.11 2002/12/13 10:56:05 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/ChangeLog,v 1.12 2003/02/10 11:09:16 seemant Exp $
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
 *fte-20020324 (17 May 2002)
 
+  10 Feb 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
+
+  Removed redundant patches in files/.  Also, inherit eutils to use epatch
+  in the two older versions.  And change from cat | sed to just sed.  And
+  finally change sed expression delimiters from / to :, closing bug #15006
+  by Blu3 <david+gentoo.org@blue-labs.org>
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
   18 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> fte-20020324.ebuild :
   Updated to mirror://sourceforge in SRC_URI.
 
diff --git a/app-editors/fte/files/fte-20010819-r1-gentoo.diff b/app-editors/fte/files/fte-20010819-r1-gentoo.diff
deleted file mode 100644
index d5d497b81a81..000000000000
--- a/app-editors/fte/files/fte-20010819-r1-gentoo.diff
+++ /dev/null
@@ -1,71 +0,0 @@
---- Makefile.orig	Wed Aug  8 04:14:56 2001
-+++ Makefile	Mon Sep 17 21:17:51 2001
-@@ -1,8 +1,8 @@
--PREFIX=/usr/local
-+PREFIX=/usr
- 
- BINDIR=$(PREFIX)/bin
- LIBDIR=$(PREFIX)/lib/fte
--CONFIGDIR=$(LIBDIR)/config
-+CONFIGDIR=/usr/share/fte
- 
- .PHONY: all install
- 
---- src/fte-unix.mak.orig	Tue Sep 18 00:17:42 2001
-+++ src/fte-unix.mak	Tue Sep 18 00:18:34 2001
-@@ -5,7 +5,7 @@
- 
- #  vfte - for Linux console directly (with limitations, see con_linux.cpp)
- 
--TARGETS = xfte vfte sfte
-+TARGETS = @targets@
- #TARGETS = xfte
- 
- PRIMARY = xfte
-@@ -122,18 +122,18 @@
- 
- #######################################################################
- 
--#QTDIR   = /users/markom/qt
--#QLIBDIR  = -L$(QTDIR)/lib
--#QINCDIR  = -I$(QTDIR)/include
-+QTDIR    = /usr/X11R6/lib/qt
-+QLIBDIR  = -L$(QTDIR)/lib
-+QINCDIR  = -I$(QTDIR)/include
- #QINCDIR  = -I/usr/include/qt
- 
--MOC      = moc
-+MOC      = /usr/X11R6/lib/qt/bin/moc
- 
- LIBDIR   = 
- INCDIR   =
- 
- #OPTIMIZE = -g # -O -g
--OPTIMIZE = -O2
-+OPTIMIZE = @cflags@
- #OPTIMIZE = -O2 -s
- 
- CCFLAGS  = $(OPTIMIZE) $(I18NOPTIONS) $(APPOPTIONS) $(COPTIONS) -DUNIX $(UOS) $(INCDIR) $(XINCDIR) $(QINCDIR) $(MINCDIR) $(SINCDIR)
-@@ -174,9 +174,9 @@
- 	perl mkdefcfg.pl <defcfg.cnf >defcfg.h
- 
- #DEFAULT_FTE_CONFIG = simple.fte
--DEFAULT_FTE_CONFIG = defcfg.fte
-+#DEFAULT_FTE_CONFIG = defcfg.fte
- #DEFAULT_FTE_CONFIG = defcfg2.fte
--#DEFAULT_FTE_CONFIG = ../config/main.fte
-+DEFAULT_FTE_CONFIG = ../config/main.fte
- 
- defcfg.cnf: $(DEFAULT_FTE_CONFIG) cfte
- 	./cfte $(DEFAULT_FTE_CONFIG) defcfg.cnf
-@@ -184,8 +184,8 @@
- xfte: $(OBJS) $(XOBJS)
- 	$(LD) $(LDFLAGS) $(OBJS) $(XOBJS) $(XLIBS) -o xfte
- 
--#qfte: g_qt.moc g_qt_dlg.moc $(OBJS) $(QOBJS)
--#	$(LD) $(LDFLAGS) $(OBJS) $(QOBJS) $(QLIBS) $(XLIBS) -o qfte
-+qfte: g_qt.moc g_qt_dlg.moc $(OBJS) $(QOBJS)
-+	$(LD) $(LDFLAGS) $(OBJS) $(QOBJS) $(QLIBS) $(XLIBS) -o qfte
- 
- vfte: $(OBJS) $(VOBJS)
- 	$(LD) $(LDFLAGS) $(OBJS) $(VOBJS) $(VLIBS) -o vfte
diff --git a/app-editors/fte/files/fte-20010819-r2-gentoo.diff b/app-editors/fte/files/fte-20010819-r2-gentoo.diff
deleted file mode 100644
index d5d497b81a81..000000000000
--- a/app-editors/fte/files/fte-20010819-r2-gentoo.diff
+++ /dev/null
@@ -1,71 +0,0 @@
---- Makefile.orig	Wed Aug  8 04:14:56 2001
-+++ Makefile	Mon Sep 17 21:17:51 2001
-@@ -1,8 +1,8 @@
--PREFIX=/usr/local
-+PREFIX=/usr
- 
- BINDIR=$(PREFIX)/bin
- LIBDIR=$(PREFIX)/lib/fte
--CONFIGDIR=$(LIBDIR)/config
-+CONFIGDIR=/usr/share/fte
- 
- .PHONY: all install
- 
---- src/fte-unix.mak.orig	Tue Sep 18 00:17:42 2001
-+++ src/fte-unix.mak	Tue Sep 18 00:18:34 2001
-@@ -5,7 +5,7 @@
- 
- #  vfte - for Linux console directly (with limitations, see con_linux.cpp)
- 
--TARGETS = xfte vfte sfte
-+TARGETS = @targets@
- #TARGETS = xfte
- 
- PRIMARY = xfte
-@@ -122,18 +122,18 @@
- 
- #######################################################################
- 
--#QTDIR   = /users/markom/qt
--#QLIBDIR  = -L$(QTDIR)/lib
--#QINCDIR  = -I$(QTDIR)/include
-+QTDIR    = /usr/X11R6/lib/qt
-+QLIBDIR  = -L$(QTDIR)/lib
-+QINCDIR  = -I$(QTDIR)/include
- #QINCDIR  = -I/usr/include/qt
- 
--MOC      = moc
-+MOC      = /usr/X11R6/lib/qt/bin/moc
- 
- LIBDIR   = 
- INCDIR   =
- 
- #OPTIMIZE = -g # -O -g
--OPTIMIZE = -O2
-+OPTIMIZE = @cflags@
- #OPTIMIZE = -O2 -s
- 
- CCFLAGS  = $(OPTIMIZE) $(I18NOPTIONS) $(APPOPTIONS) $(COPTIONS) -DUNIX $(UOS) $(INCDIR) $(XINCDIR) $(QINCDIR) $(MINCDIR) $(SINCDIR)
-@@ -174,9 +174,9 @@
- 	perl mkdefcfg.pl <defcfg.cnf >defcfg.h
- 
- #DEFAULT_FTE_CONFIG = simple.fte
--DEFAULT_FTE_CONFIG = defcfg.fte
-+#DEFAULT_FTE_CONFIG = defcfg.fte
- #DEFAULT_FTE_CONFIG = defcfg2.fte
--#DEFAULT_FTE_CONFIG = ../config/main.fte
-+DEFAULT_FTE_CONFIG = ../config/main.fte
- 
- defcfg.cnf: $(DEFAULT_FTE_CONFIG) cfte
- 	./cfte $(DEFAULT_FTE_CONFIG) defcfg.cnf
-@@ -184,8 +184,8 @@
- xfte: $(OBJS) $(XOBJS)
- 	$(LD) $(LDFLAGS) $(OBJS) $(XOBJS) $(XLIBS) -o xfte
- 
--#qfte: g_qt.moc g_qt_dlg.moc $(OBJS) $(QOBJS)
--#	$(LD) $(LDFLAGS) $(OBJS) $(QOBJS) $(QLIBS) $(XLIBS) -o qfte
-+qfte: g_qt.moc g_qt_dlg.moc $(OBJS) $(QOBJS)
-+	$(LD) $(LDFLAGS) $(OBJS) $(QOBJS) $(QLIBS) $(XLIBS) -o qfte
- 
- vfte: $(OBJS) $(VOBJS)
- 	$(LD) $(LDFLAGS) $(OBJS) $(VOBJS) $(VLIBS) -o vfte
diff --git a/app-editors/fte/fte-20010819-r2.ebuild b/app-editors/fte/fte-20010819-r2.ebuild
index 53d1bdc18833..1a416ed2b84c 100644
--- a/app-editors/fte/fte-20010819-r2.ebuild
+++ b/app-editors/fte/fte-20010819-r2.ebuild
@@ -1,31 +1,28 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20010819-r2.ebuild,v 1.12 2002/12/09 04:17:39 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20010819-r2.ebuild,v 1.13 2003/02/10 11:09:16 seemant Exp $
+
+inherit eutils
 
 IUSE="gpm slang X"
 
 S=${WORKDIR}/${P}
-
 DESCRIPTION="Lightweight text-mode editor"
-
+HOMEPAGE="http://fte.sourceforge.net"
 SRC_URI="mirror://sourceforge/fte/fte-20010819-src.zip
-		 mirror://sourceforge/fte/fte-20010819-common.zip"
+	mirror://sourceforge/fte/fte-20010819-common.zip"
 
-HOMEPAGE="http://fte.sourceforge.net"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 sparc "
 
-DEPEND="virtual/glibc 
-	app-arch/unzip 
-	>=sys-libs/ncurses-5.2
-	>=sys-libs/gpm-1.20"
-RDEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.2
+RDEPEND=">=sys-libs/ncurses-5.2
 	gpm? ( >=sys-libs/gpm-1.20 )"
 
-TARGETS=""
+DEPEND="app-arch/unzip 
+	${RDEPEND}"
 
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
+TARGETS=""
 
 if [ "`use slang`" ] ; then
 	TARGETS="$TARGETS sfte"
@@ -41,55 +38,56 @@ fi
 
 src_unpack() {
 
-	 cd ${WORKDIR}
-	 unpack fte-20010819-src.zip
-	 unpack fte-20010819-common.zip
+	cd ${WORKDIR}
+	unpack fte-20010819-src.zip
+	unpack fte-20010819-common.zip
 
-	 mv fte fte-20010819
+	mv fte fte-20010819
 
-	 cd ${S}; patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
 
-	 cp src/fte-unix.mak src/fte-unix.mak.orig
+	cp src/fte-unix.mak src/fte-unix.mak.orig
 
-	 cat src/fte-unix.mak.orig | \
-	 sed "s/@targets@/${TARGETS}/" | \
-	 sed "s/@cflags@/${CFLAGS}/" \
-	 > src/fte-unix.mak
+	sed \
+		-e "s:@targets@:${TARGETS}:" \
+		-e "s:@cflags@:${CFLAGS}:" \
+	src/fte-unix.mak.orig > src/fte-unix.mak
 }
 
 src_compile() {
-	 emake all || die
+	emake all || die
  
-	 cd config 
-	 ../src/cfte main.fte ../src/system.fterc
+	cd config 
+	../src/cfte main.fte ../src/system.fterc
 }
 
 src_install () {
-	 local files
-	 into /usr
+	local files
+	into /usr
 
-	 files="${TARGETS} cfte compkeys"
+	files="${TARGETS} cfte compkeys"
 
-	 for i in ${files} ; do
-	  dobin src/$i ;
-	 done
+	for i in ${files} ; do
+		dobin src/$i ;
+	done
 
-	 dodoc Artistic CHANGES BUGS COPYING HISTORY README TODO 
+	dodoc Artistic CHANGES BUGS COPYING HISTORY README TODO 
 	
-	 dodir etc/fte
-	 cp src/system.fterc ${D}/etc/fte/system.fterc
+	dodir etc/fte
+	cp src/system.fterc ${D}/etc/fte/system.fterc
 
-	 dodir usr/share/doc/${P}/html
-	 cp doc/INDEX doc/*.html ${D}/usr/share/doc/${P}/html
+	dodir usr/share/doc/${P}/html
+	cp doc/INDEX doc/*.html ${D}/usr/share/doc/${P}/html
 
-#   if [ -a ${D}/usr/bin/xfte ] ; then
-#      into /usr/X11R6 ;
-#      dobin src/xfte ;
-#      rm ${D}/usr/bin/xfte ;
-#   fi
+#	if [ -a ${D}/usr/bin/xfte ] ; then
+#		into /usr/X11R6 ;
+#		dobin src/xfte ;
+#		rm ${D}/usr/bin/xfte ;
+#	fi
 	 
-	 dodir usr/share/fte
-	 cp -R config/* ${D}/usr/share/fte
-	 rm -rf ${D}/usr/share/fte/CVS
+	dodir usr/share/fte
+	cp -R config/* ${D}/usr/share/fte
+	rm -rf ${D}/usr/share/fte/CVS
 }
 
diff --git a/app-editors/fte/fte-20010819-r3.ebuild b/app-editors/fte/fte-20010819-r3.ebuild
index 0e6d5a1a76c2..0baa724392c5 100644
--- a/app-editors/fte/fte-20010819-r3.ebuild
+++ b/app-editors/fte/fte-20010819-r3.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20010819-r3.ebuild,v 1.11 2002/12/09 04:17:39 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20010819-r3.ebuild,v 1.12 2003/02/10 11:09:16 seemant Exp $
+
+inherit eutils
 
 IUSE="gpm slang X"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Lightweight text-mode editor"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip
-		 mirror://sourceforge/${PN}/${P}-common.zip"
+	mirror://sourceforge/${PN}/${P}-common.zip"
 HOMEPAGE="http://fte.sourceforge.net"
 
 RDEPEND=">=sys-libs/ncurses-5.2
@@ -21,18 +23,18 @@ TARGETS=""
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
+KEYWORDS="x86 sparc"
 
 if [ "`use slang`" ] ; then
-	 TARGETS="${TARGETS} sfte"
+	TARGETS="${TARGETS} sfte"
 fi
 
 if [ "`use X`" ] ; then
-	 TARGETS="${TARGETS} xfte"
+	TARGETS="${TARGETS} xfte"
 fi
 
 if [ "`use gpm`" ] ; then
-	 TARGETS="${TARGETS} vfte"
+	TARGETS="${TARGETS} vfte"
 fi
 
 src_unpack() {
@@ -43,14 +45,14 @@ src_unpack() {
 
 	mv fte fte-20010819
 
-	cd ${S}; patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
 
 	cp src/fte-unix.mak src/fte-unix.mak.orig
 
-	cat src/fte-unix.mak.orig | \
-	sed "s/@targets@/${TARGETS}/" | \
-	sed "s/@cflags@/${CFLAGS}/" \
-	> src/fte-unix.mak
+	sed -e "s:@targets@:${TARGETS}:" \
+		-e "s:@cflags@:${CFLAGS}:" \
+		src/fte-unix.mak.orig > src/fte-unix.mak
 }
 
 src_compile() {
@@ -78,14 +80,7 @@ src_install () {
 	dodir usr/share/doc/${P}/html
 	cp doc/INDEX doc/*.html ${D}/usr/share/doc/${P}/html
 
-#	if [ -a ${D}/usr/bin/xfte ] ; then
-#		into /usr/X11R6 ;
-#		dobin src/xfte ;
-#		rm ${D}/usr/bin/xfte ;
-#	fi
-	
 	dodir usr/share/fte
 	cp -R config/* ${D}/usr/share/fte
 	rm -rf ${D}/usr/share/fte/CVS
 }
-
diff --git a/app-editors/fte/fte-20020324.ebuild b/app-editors/fte/fte-20020324.ebuild
index c810a4118831..3bc8cb95b764 100644
--- a/app-editors/fte/fte-20020324.ebuild
+++ b/app-editors/fte/fte-20020324.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20020324.ebuild,v 1.13 2002/12/09 04:17:39 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20020324.ebuild,v 1.14 2003/02/10 11:09:16 seemant Exp $
 
 IUSE="gpm slang X"
 
@@ -10,6 +10,10 @@ SRC_URI="mirror://sourceforge/fte/${P}-src.zip
 	mirror://sourceforge/fte/${P}-common.zip"
 HOMEPAGE="http://fte.sourceforge.net"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc"
+
 RDEPEND=">=sys-libs/ncurses-5.2
 	gpm? ( >=sys-libs/gpm-1.20 )"
 
@@ -31,10 +35,6 @@ if [ "`use gpm`" ] ; then
 	TARGETS="${TARGETS} vfte"
 fi
 
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
-
 src_unpack() {
 
 	cd ${WORKDIR}
@@ -43,14 +43,14 @@ src_unpack() {
 
 	mv fte fte-20020324
 
-	cd ${S} # ; patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
+	cd ${S}
 
 	cp src/fte-unix.mak src/fte-unix.mak.orig
 
-	cat src/fte-unix.mak.orig | \
-	sed "s/@targets@/${TARGETS}/" | \
-	sed "s/@cflags@/${CFLAGS}/" \
-	> src/fte-unix.mak
+	sed \
+		-e "s:@targets@:${TARGETS}:" \
+		-e "s:@cflags@:${CFLAGS}:" \
+		src/fte-unix.mak.orig  > src/fte-unix.mak
 }
 
 src_compile() {
@@ -91,4 +91,3 @@ src_install () {
 	cp -R config/* ${D}/usr/share/fte
 	rm -rf ${D}/usr/share/fte/CVS
 }
-