Fixing bug #21352

5 files changed, 123 insertions, 6 deletions

diff --git a/app-editors/fte/ChangeLog b/app-editors/fte/ChangeLog
index 50bfe503e6be..227fe0c91ca4 100644
--- a/app-editors/fte/ChangeLog
+++ b/app-editors/fte/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/fte
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/ChangeLog,v 1.17 2004/03/13 22:29:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/ChangeLog,v 1.18 2004/03/17 14:32:49 phosphan Exp $
+
+*fte-20020324-r2 (17 Mar 2004)
+
+  17 Mar 2004; Patrick Kursawe <phosphan@gentoo.org> fte-20020324-r2.ebuild,
+  files/configpath.patch:
+  Fixing bug #21352
 
   13 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> fte-20010819-r2.ebuild,
   fte-20010819-r3.ebuild, fte-20020324-r1.ebuild, fte-20020324.ebuild:
diff --git a/app-editors/fte/Manifest b/app-editors/fte/Manifest
index 3e673676fa17..88cacc77b4c1 100644
--- a/app-editors/fte/Manifest
+++ b/app-editors/fte/Manifest
@@ -1,11 +1,14 @@
-MD5 b3f245dc29fec90af61ff609ba6e4cf4 ChangeLog 3163
-MD5 715e60bebc1e53c9d7e2f2af285d14c6 fte-20010819-r2.ebuild 1756
+MD5 2b20ea38e4fc63273f8a07b3a882ec52 fte-20020324-r2.ebuild 1773
 MD5 ab15d147fd12e89dcf98859b826d7b49 fte-20010819-r3.ebuild 1586
 MD5 4b801fac630c850c861a553efdcf1771 fte-20020324-r1.ebuild 1872
 MD5 337e8046ca1244ded5d830d9d37d8560 fte-20020324.ebuild 1845
+MD5 a56578b4a80fd38629a5d2e7f3f8499a ChangeLog 3318
+MD5 715e60bebc1e53c9d7e2f2af285d14c6 fte-20010819-r2.ebuild 1756
+MD5 7c996af2e2e68f96a748f4269c76f710 files/fte 604
+MD5 71a39685b85b6ccba3d9a8a0dc5ee9bf files/fte-20010819-gentoo.diff 1903
 MD5 14b0444b3c0e9a62373b4a104b2a8707 files/digest-fte-20010819-r2 133
 MD5 14b0444b3c0e9a62373b4a104b2a8707 files/digest-fte-20010819-r3 133
-MD5 23d2b8a8749e3a4a9f9ab911641d50e8 files/digest-fte-20020324 133
+MD5 333d7c07d793fca986bf2558e5105607 files/configpath.patch 572
 MD5 23d2b8a8749e3a4a9f9ab911641d50e8 files/digest-fte-20020324-r1 133
-MD5 7c996af2e2e68f96a748f4269c76f710 files/fte 604
-MD5 71a39685b85b6ccba3d9a8a0dc5ee9bf files/fte-20010819-gentoo.diff 1903
+MD5 23d2b8a8749e3a4a9f9ab911641d50e8 files/digest-fte-20020324-r2 133
+MD5 23d2b8a8749e3a4a9f9ab911641d50e8 files/digest-fte-20020324 133
diff --git a/app-editors/fte/files/configpath.patch b/app-editors/fte/files/configpath.patch
new file mode 100644
index 000000000000..168974b3f6a1
--- /dev/null
+++ b/app-editors/fte/files/configpath.patch
@@ -0,0 +1,13 @@
+--- src/cfte.cpp	2002-03-23 00:46:32.000000000 +0100
++++ src/cfte.cpp.new	2004-03-17 15:25:13.170166354 +0100
+@@ -1756,8 +1756,8 @@
+         //fprintf(stderr, "Looking for %s\n", Cfg);
+         if (!FileExists(Cfg))
+         {
+-            // Okay, now try "local config".
+-            sprintf(tmp, "%slocalconfig/%s", StartDir, CfgName);
++	    // Try at least one FHS compliant location
++            sprintf(tmp, "/usr/share/fte/%s", CfgName);
+             ExpandPath(tmp, Cfg);
+             //fprintf(stderr, "Looking for %s\n", Cfg);
+             if (!FileExists(Cfg))
diff --git a/app-editors/fte/files/digest-fte-20020324-r2 b/app-editors/fte/files/digest-fte-20020324-r2
new file mode 100644
index 000000000000..26a8064a0c2b
--- /dev/null
+++ b/app-editors/fte/files/digest-fte-20020324-r2
@@ -0,0 +1,2 @@
+MD5 6a0fb80491e4a4edfab0faf8f5a3dc49 fte-20020324-src.zip 625459
+MD5 499b051f6484df3b4f93b43fe9143d0f fte-20020324-common.zip 184928
diff --git a/app-editors/fte/fte-20020324-r2.ebuild b/app-editors/fte/fte-20020324-r2.ebuild
new file mode 100644
index 000000000000..cb4aad0b511f
--- /dev/null
+++ b/app-editors/fte/fte-20020324-r2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20020324-r2.ebuild,v 1.1 2004/03/17 14:32:49 phosphan Exp $
+
+inherit eutils
+
+IUSE="gpm slang X"
+
+DESCRIPTION="Lightweight text-mode editor"
+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 )"
+
+DEPEND="${RDEPEND}
+	slang? ( sys-libs/slang )
+	app-arch/unzip
+	X? ( virtual/x11 )"
+
+TARGETS=""
+
+if [ "`use slang`" ] ; then
+	TARGETS="${TARGETS} sfte"
+fi
+
+if [ "`use X`" ] ; then
+	TARGETS="${TARGETS} xfte"
+fi
+
+if [ "`use gpm`" ] ; then
+	TARGETS="${TARGETS} vfte"
+fi
+
+src_unpack() {
+
+	cd ${WORKDIR}
+	unpack fte-20020324-src.zip
+	unpack fte-20020324-common.zip
+
+	mv fte fte-20020324
+
+	cd ${S}
+
+	epatch ${FILESDIR}/configpath.patch
+
+	sed \
+		-e "s:@targets@:${TARGETS}:" \
+		-e "s:@cflags@:${CFLAGS}:" \
+		-i src/fte-unix.mak
+}
+
+src_compile() {
+	DEFFLAGS="PREFIX=/usr CONFIGDIR=/usr/share/fte \
+		DEFAULT_FTE_CONFIG=../config/main.fte OPTIMIZE="
+
+	emake $DEFFLAGS TARGETS="$TARGETS" all || die
+}
+
+src_install () {
+	local files
+	into /usr
+
+	files="${TARGETS} cfte compkeys"
+
+	for i in ${files} ; do
+		dobin src/$i ;
+	done
+
+	dobin ${FILESDIR}/fte
+
+	dodoc Artistic CHANGES BUGS COPYING HISTORY README TODO
+
+	keepdir etc/fte
+
+	dodir usr/share/doc/${P}/html
+	cp doc/INDEX doc/*.html ${D}/usr/share/doc/${P}/html
+
+	dodir usr/share/fte
+	cp -R config/* ${D}/usr/share/fte
+	rm -rf ${D}/usr/share/fte/CVS
+}
+
+pkg_postinst() {
+	einfo "Compiling configuration..."
+	cd /usr/share/fte
+	/usr/bin/cfte main.fte /etc/fte/system.fterc
+}