touchups + fix for #14463

3 files changed, 22 insertions, 45 deletions

diff --git a/dev-lang/ferite/ChangeLog b/dev-lang/ferite/ChangeLog
index 57271afffb96..5babc669270c 100644
--- a/dev-lang/ferite/ChangeLog
+++ b/dev-lang/ferite/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for dev-lang/ferite
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ferite/ChangeLog,v 1.6 2003/01/09 15:38:42 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ferite/ChangeLog,v 1.7 2003/01/24 22:33:29 vapier Exp $
 
 *ferite-0.99.5 (17 Aug 2002)
 
+  24 Jan 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added econf in place of configure.  Fix for #14463.
+
   09 Jan 2003; Martin Holzer <mholzer@gentoo.org> ferrite-0.99.5.ebuild :
   Changed SRC_URI to mirror://sf
 
@@ -11,14 +14,14 @@
   added ~ppc to KEYWORDS
 
   17 Aug 2002; G.Shapovalov <george@gentoo.org> ChangeLog :
-  
   new version
   also modified ebuild to fix sandbox violation
 
-
 *ferite-0.99.4 (1 May 2002)
 
-  1 May 2002; G.Saraber <gsaraber@rarcoa.com> ChangeLog :
+  24 Jan 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added econf in place of configure.  Fix for #14463.
 
+  1 May 2002; G.Saraber <gsaraber@rarcoa.com> ChangeLog :
   modified the glib ebuild into ferite :)
   original by Achim Gottinger <achim@gentoo.org>
diff --git a/dev-lang/ferite/ferite-0.99.4.ebuild b/dev-lang/ferite/ferite-0.99.4.ebuild
index a7954a32422b..5c223b311807 100644
--- a/dev-lang/ferite/ferite-0.99.4.ebuild
+++ b/dev-lang/ferite/ferite-0.99.4.ebuild
@@ -1,38 +1,26 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ferite/ferite-0.99.4.ebuild,v 1.9 2003/01/09 15:38:42 mholzer Exp $
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="ferite is a scripting engine and language written in c for complete portability."
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ferite/ferite-0.99.4.ebuild,v 1.10 2003/01/24 22:33:29 vapier Exp $
 
+DESCRIPTION="scripting engine and language written in c for complete portability"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.ferite.org/"
 
 DEPEND="virtual/glibc
-		dev-libs/libpcre
-		dev-libs/libxml2"
+	dev-libs/libpcre
+	dev-libs/libxml2"
 
 SLOT="1"
 LICENSE="as-is"
-KEYWORDS="x86 sparc "
+KEYWORDS="x86 sparc"
 
 src_compile() {
-	./configure --host=${CHOST} \
-			--prefix=/usr \
-			--infodir=/usr/share/info \
-			--mandir=/usr/share/man || die
-
+	econf || die
 	emake || die
 }
 
 src_install() {
-	make prefix=${D}/usr \
-		 infodir=${D}/usr/share/info \
-		 mandir=${D}/usr/share/man \
-		 install || die
-	
-	dodoc AUTHORS ChangeLog COPYING README* INSTALL NEWS
-
+	einstall || die
+	dodoc AUTHORS ChangeLog README*
 	dohtml -r docs
 }
diff --git a/dev-lang/ferite/ferite-0.99.5.ebuild b/dev-lang/ferite/ferite-0.99.5.ebuild
index a50285a382f3..2cac2c26ce88 100644
--- a/dev-lang/ferite/ferite-0.99.5.ebuild
+++ b/dev-lang/ferite/ferite-0.99.5.ebuild
@@ -1,40 +1,26 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ferite/ferite-0.99.5.ebuild,v 1.6 2003/01/09 15:38:42 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ferite/ferite-0.99.5.ebuild,v 1.7 2003/01/24 22:33:29 vapier Exp $
 
-S=${WORKDIR}/${P}
-
-DESCRIPTION="ferite is a scripting engine and language written in c for complete portability."
+DESCRIPTION="scripting engine and language written in c for complete portability"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.ferite.org/"
 
 DEPEND="virtual/glibc
-		dev-libs/libpcre
-		dev-libs/libxml2"
+	dev-libs/libpcre
+	dev-libs/libxml2"
 
 SLOT="1"
 LICENSE="as-is"
-KEYWORDS="x86 sparc  ~ppc"
+KEYWORDS="x86 ~ppc sparc"
 
 src_compile() {
-	./configure --host=${CHOST} \
-			--prefix=/usr \
-			--infodir=/usr/share/info \
-			--mandir=/usr/share/man || die
-
+	econf || die
 	emake || die
 }
 
 src_install() {
-	#make prefix=${D}/usr \
-	#	 infodir=${D}/usr/share/info \
-	#	 mandir=${D}/usr/share/man \
-	#	 libdir=${D}/usr/lib \
-	#	 install || die
-	
 	make DESTDIR=${D} install || die
-	
-	dodoc AUTHORS ChangeLog COPYING README* INSTALL NEWS
-
+	dodoc AUTHORS ChangeLog README*
 	dohtml -r docs
 }