fte version bump

5 files changed, 135 insertions, 2 deletions

diff --git a/app-editors/fte/ChangeLog b/app-editors/fte/ChangeLog
index cab0fafc8bca..feba5d8e7830 100644
--- a/app-editors/fte/ChangeLog
+++ b/app-editors/fte/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/fte
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/ChangeLog,v 1.24 2005/01/01 13:24:52 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/ChangeLog,v 1.25 2005/01/12 16:05:16 hanno Exp $
+
+*fte-20050108 (12 Jan 2005)
+
+  12 Jan 2005; Hanno Boeck <hanno@gentoo.org> +files/fte-gcc34,
+  +fte-20050108.ebuild:
+  Version bump and gcc 3.4-fix.
 
   05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   fte-20020324-r1.ebuild, fte-20020324-r2.ebuild:
diff --git a/app-editors/fte/Manifest b/app-editors/fte/Manifest
index c9cb5b77095c..1a7140053fef 100644
--- a/app-editors/fte/Manifest
+++ b/app-editors/fte/Manifest
@@ -1,10 +1,13 @@
-MD5 93ee22c2cb19c132d306e52bd695035f ChangeLog 3979
+MD5 04eaf0476015a1656eff7501c6f8bf0b ChangeLog 4124
 MD5 9e95a238c5e3224f9aaae3ff29d27487 fte-20020324-r1.ebuild 1856
 MD5 0960b72b6494de01232b0fd9da73de46 fte-20020324-r2.ebuild 1738
 MD5 87e47c735985989518ca1202edd044c1 fte-20020324.ebuild 1813
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
+MD5 0aaf57d747e068d9f581ca0e50ab20b4 fte-20050108.ebuild 1707
 MD5 333d7c07d793fca986bf2558e5105607 files/configpath.patch 572
 MD5 23d2b8a8749e3a4a9f9ab911641d50e8 files/digest-fte-20020324 133
 MD5 23d2b8a8749e3a4a9f9ab911641d50e8 files/digest-fte-20020324-r1 133
 MD5 23d2b8a8749e3a4a9f9ab911641d50e8 files/digest-fte-20020324-r2 133
 MD5 7c996af2e2e68f96a748f4269c76f710 files/fte 604
+MD5 5890d034c66b5003475090a5312cfbe8 files/digest-fte-20050108 133
+MD5 be13218f7abfe31d83940c80adcbc59c files/fte-gcc34 1092
diff --git a/app-editors/fte/files/digest-fte-20050108 b/app-editors/fte/files/digest-fte-20050108
new file mode 100644
index 000000000000..9bd190d0e669
--- /dev/null
+++ b/app-editors/fte/files/digest-fte-20050108
@@ -0,0 +1,2 @@
+MD5 910ef0041d5d56ede596fc6eb90c1f11 fte-20050108-src.zip 545246
+MD5 200d22e821e550148c0494b54d7dfd25 fte-20050108-common.zip 186252
diff --git a/app-editors/fte/files/fte-gcc34 b/app-editors/fte/files/fte-gcc34
new file mode 100644
index 000000000000..51940e650657
--- /dev/null
+++ b/app-editors/fte/files/fte-gcc34
@@ -0,0 +1,38 @@
+--- fte/src/con_slang.cpp	2003-02-16 19:23:58.000000000 +0100
++++ fte-gcc34/src/con_slang.cpp	2005-01-12 16:57:38.050369064 +0100
+@@ -246,7 +246,7 @@
+     SLsmg_write_nchars(slang_dchs, sizeof(slang_dchs));
+ 
+     SLsmg_gotorc(0, 0);
+-    SLsmg_read_raw(linebuf, sizeof(slang_dchs));
++    SLsmg_read_raw((SLsmg_Char_Type*)linebuf, sizeof(slang_dchs));
+     for (i = 0; i < sizeof(slang_dchs); i++)
+ 	raw_dchs[i] = (linebuf[i]) & 0xff;
+ 
+@@ -368,7 +368,7 @@
+     ConQueryCursorPos(&CurX, &CurY);
+     while (H > 0) {
+ 	SLsmg_gotorc(Y++, X);
+-	SLsmg_write_raw(box, W);
++	SLsmg_write_raw((SLsmg_Char_Type*)box, W);
+ 	box += W;
+ 	H--;
+     }
+@@ -386,7 +386,7 @@
+     ConQueryCursorPos(&CurX, &CurY);
+     while (H > 0) {
+ 	SLsmg_gotorc(Y++, X);
+-	SLsmg_read_raw(Cell, W);
++	SLsmg_read_raw((SLsmg_Char_Type*)Cell, W);
+ 	for (i = 0; i < W; i++)
+ 	    if (Cell[i] & 0x8000) {
+ 		ch = Cell[i] & 0xff;
+@@ -409,7 +409,7 @@
+     ConQueryCursorPos(&CurX, &CurY);
+     while (H > 0) {
+ 	SLsmg_gotorc(Y++, X);
+-	SLsmg_read_raw(box, W);
++	SLsmg_read_raw((SLsmg_Char_Type*)box, W);
+ 	box += W;
+ 	H--;
+     }
diff --git a/app-editors/fte/fte-20050108.ebuild b/app-editors/fte/fte-20050108.ebuild
new file mode 100644
index 000000000000..d1d55971c1c1
--- /dev/null
+++ b/app-editors/fte/fte-20050108.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20050108.ebuild,v 1.1 2005/01/12 16:05:16 hanno Exp $
+
+inherit eutils
+
+DESCRIPTION="Lightweight text-mode editor"
+HOMEPAGE="http://fte.sourceforge.net"
+SRC_URI="mirror://sourceforge/fte/${P}-src.zip
+	mirror://sourceforge/fte/${P}-common.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
+IUSE="gpm slang X"
+S=${WORKDIR}/${PN}
+
+RDEPEND=">=sys-libs/ncurses-5.2
+	gpm? ( >=sys-libs/gpm-1.20 )"
+DEPEND="${RDEPEND}
+	slang? ( sys-libs/slang )
+	app-arch/unzip
+	X? ( virtual/x11 )"
+
+set_targets() {
+	export TARGETS=""
+	use slang && TARGETS="$TARGETS sfte"
+	use X && TARGETS="$TARGETS xfte"
+	use gpm && TARGETS="$TARGETS vfte"
+}
+
+src_unpack() {
+	unpack ${P}-src.zip
+	unpack ${P}-common.zip
+
+	cd ${S}
+
+	epatch ${FILESDIR}/fte-gcc34
+
+	set_targets
+	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="
+
+	set_targets
+	emake $DEFFLAGS TARGETS="$TARGETS" all || die
+}
+
+src_install() {
+	local files
+	into /usr
+
+	set_targets
+	files="${TARGETS} cfte compkeys"
+
+	for i in ${files} ; do
+		dobin src/$i ;
+	done
+
+	dobin ${FILESDIR}/fte
+
+	dodoc Artistic CHANGES BUGS 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
+}