bug fixes

6 files changed, 78 insertions, 64 deletions

diff --git a/app-editors/nedit/ChangeLog b/app-editors/nedit/ChangeLog
index 2a3dbf954847..21a4ee9e572b 100644
--- a/app-editors/nedit/ChangeLog
+++ b/app-editors/nedit/ChangeLog
@@ -1,11 +1,20 @@
 # ChangeLog for app-editors/nedit
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/ChangeLog,v 1.7 2002/12/13 10:56:06 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/ChangeLog,v 1.8 2003/01/20 02:05:29 seemant Exp $
+
+*nedit-5.3-r2 (19 Jan 2003)
+
+  19 Jan 2003; Seemant Kulleen <seemant@gentoo.org> nedit-5.3-r2.ebuild
+  files/nedit-5.3-gentoo.diff files/digest-nedit-5.3-r2 :
+
+  Added a patch to use aspell instead of ispell for spell checking.  The
+  patch also makes nedit use /bin/sh by default instead of /bin/csh, which
+  closes bug #11526 by webmaster@multi-air.com (Tom Ribbens)
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
 *nedit-5.3-r1 (22 Oct 2002)
 
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
   22 Oct 2002; Seemant Kulleen <seemant@gentoo.org> nedit-5.3-r1.ebuild
   files/digest-nedit-5.3-r1 :
 
diff --git a/app-editors/nedit/files/digest-nedit-5.2 b/app-editors/nedit/files/digest-nedit-5.2
deleted file mode 100644
index d43c65f6fc9e..000000000000
--- a/app-editors/nedit/files/digest-nedit-5.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c5aa936eccfc1d1c0f39d339f0d88d76 nedit-5.2-src.tar.gz 768534
diff --git a/app-editors/nedit/files/digest-nedit-5.3 b/app-editors/nedit/files/digest-nedit-5.3
deleted file mode 100644
index 8ad5b649f10d..000000000000
--- a/app-editors/nedit/files/digest-nedit-5.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 47afb4e07698f45e95d49c27f3d2f9e1 nedit-5.3-source.tar.gz 991690
diff --git a/app-editors/nedit/files/nedit-5.3-gentoo.diff b/app-editors/nedit/files/nedit-5.3-gentoo.diff
new file mode 100644
index 000000000000..f36e1e67b353
--- /dev/null
+++ b/app-editors/nedit/files/nedit-5.3-gentoo.diff
@@ -0,0 +1,52 @@
+diff -urN nedit-5.3.old/makefiles/Makefile.linux nedit-5.3/makefiles/Makefile.linux
+--- nedit-5.3.old/makefiles/Makefile.linux	2002-03-07 08:42:55.000000000 -0800
++++ nedit-5.3/makefiles/Makefile.linux	2003-01-19 17:45:32.000000000 -0800
+@@ -5,7 +5,7 @@
+ # For editres, add -DEDITRES to CFLAGS and -lXmu to LIBS
+ # If using a Motif 2.1 compatible library (LessTif, OM) add
+ # a '-lXp' in front of the -lXext in LIBS. You also drop the
+-# -lXpm from that list.
++# from that list.
+ # Ensure that the Motif/LessTif headers and libs are found!
+ # e.g. you may have to add something like 
+ #   -I/usr/lesstif/include  to CFLAGS and
+@@ -14,8 +14,8 @@
+ # To evaluate an alternative layout for the Replace/Find dialog, add
+ # -DREPLACE_SCOPE to the CFLAGS. See the README file for more information.
+ #
+-CFLAGS=-O -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD
++CFLAGS=-O -I/usr/X11R6/include -D__LINUX__ -DUSE_DIRENT -DUSE_LPR_PRINT_CMD
+ ARFLAGS=-urs
+-LIBS= -L/usr/X11R6/lib -Wl,-Bstatic -lXm -Wl,-Bdynamic -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm
++LIBS= -L/usr/X11R6/lib -Wl,-Bstatic -lXm -Wl,-Bdynamic -lXp -lXext -lXt -lSM -lICE -lX11 -lm -lXmu
+ 
+ include Makefile.common
+diff -urN nedit-5.3.old/source/preferences.c nedit-5.3/source/preferences.c
+--- nedit-5.3.old/source/preferences.c	2002-05-16 00:53:09.000000000 -0700
++++ nedit-5.3/source/preferences.c	2003-01-19 17:44:57.000000000 -0800
+@@ -271,14 +271,14 @@
+ #ifndef VMS
+ #ifdef linux
+     {"shellCommands", "ShellCommands", PREF_ALLOC_STRING, "spell:Alt+B:s:EX:\n\
+-	cat>spellTmp; xterm -e ispell -x spellTmp; cat spellTmp; rm spellTmp\n\
++	cat>spellTmp; xterm -e aspell -c -x spellTmp; cat spellTmp; rm spellTmp\n\
+ 	wc::w:ED:\nset wc=`wc`; echo $wc[1] \"lines,\" $wc[2] \"words,\" $wc[3] \"characters\"\n\
+ 	sort::o:EX:\nsort\nnumber lines::n:AW:\nnl -ba\nmake:Alt+Z:m:W:\nmake\n\
+ 	expand::p:EX:\nexpand\nunexpand::u:EX:\nunexpand\n",
+     	&TempStringPrefs.shellCmds, NULL, True},
+ #elif __FreeBSD__
+     {"shellCommands", "ShellCommands", PREF_ALLOC_STRING, "spell:Alt+B:s:EX:\n\
+-      cat>spellTmp; xterm -e ispell -x spellTmp; cat spellTmp; rm spellTmp\n\
++      cat>spellTmp; xterm -e aspell -c -x spellTmp; cat spellTmp; rm spellTmp\n\
+       wc::w:ED:\nset wc=`wc`; echo $wc[1] \"words,\" $wc[2] \"lines,\" $wc[3] \"characters\"\n\
+       sort::o:EX:\nsort\nnumber lines::n:AW:\npr -tn\nmake:Alt+Z:m:W:\nmake\n\
+       expand::p:EX:\nexpand\nunexpand::u:EX:\nunexpand\n",
+@@ -786,6 +786,8 @@
+     {"shell", "Shell", PREF_STRING,
+ #if defined(__MVS__) || defined(__EMX__)
+     	"/bin/sh",
++#elif __LINUX__
++	"/bin/sh",
+ #else
+         "/bin/csh",
+ #endif
diff --git a/app-editors/nedit/nedit-5.2.ebuild b/app-editors/nedit/nedit-5.2.ebuild
deleted file mode 100644
index 1221d6cc60b6..000000000000
--- a/app-editors/nedit/nedit-5.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/nedit-5.2.ebuild,v 1.8 2002/12/09 04:17:40 manson Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="NEdit is a multi-purpose text editor for the X Window System"
-SRC_URI="ftp://ftp.nedit.org/pub/v5_2/${P}-src.tar.gz"
-HOMEPAGE="http://nedit.org/"
-
-DEPEND="virtual/glibc
-	>=dev-util/yacc-1.9.1
-	>=x11-libs/openmotif-2.1.30"
-
-RDEPEND="virtual/glibc
-	>=x11-libs/openmotif-2.1.30"
-
-SLOT="0"
-KEYWORDS="x86 ppc sparc "
-LICENSE="GPL-2"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}/makefiles
-	cp Makefile.linux Makefile.orig
-	sed -e "s:-O:${CFLAGS}:" Makefile.orig > Makefile.linux
-
-}
-
-src_compile() {
-
-	make linux || die
-
-}
-
-src_install () {
-
-	into /usr
-	dobin source/nc source/nedit
-	newman doc/nedit.man nedit.1
-	newman doc/nc.man nc.1
-	dodoc README ReleaseNotes doc/faq* doc/nedit.doc doc/README.FAQ doc/NEdit.ad
-
-}
-
diff --git a/app-editors/nedit/nedit-5.3.ebuild b/app-editors/nedit/nedit-5.3-r2.ebuild
index d184e1983495..e71f1583d05b 100644
--- a/app-editors/nedit/nedit-5.3.ebuild
+++ b/app-editors/nedit/nedit-5.3-r2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/nedit-5.3.ebuild,v 1.7 2002/12/09 04:17:40 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/nedit-5.3-r2.ebuild,v 1.1 2003/01/20 02:05:29 seemant Exp $
+
+inherit eutils
 
 S=${WORKDIR}/${P}
 MY_PV=${PV/./_}
@@ -10,39 +12,37 @@ HOMEPAGE="http://nedit.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 ppc sparc"
 
-RDEPEND=">=x11-libs/openmotif-2.1.30"
+RDEPEND="spell? ( app-text/aspell )"
 
 DEPEND="${RDEPEND}
 	dev-util/yacc"
 
 src_unpack() {
-
 	unpack ${A}
-	cd ${S}/makefiles
-	cp Makefile.linux Makefile.orig
-	sed -e "s:-O:${CFLAGS}:" -e "s/-lm/-lm -lXmu/" \
-	Makefile.orig > Makefile.linux || die
 
+	epatch ${FILESDIR}/${P}-gentoo.diff
+
+	cp ${S}/makefiles/Makefile.linux ${T}
+	sed "s:-O:${CFLAGS} -D__LINUX__:" \
+		${T}/Makefile.linux > ${S}/makefiles/Makefile.linux
 }
 
 src_compile() {
-
 	make linux || die
-
 }
 
 src_install () {
-
 	into /usr
-	dobin source/nc source/nedit
+	dobin source/nedit
+	exeinto /usr/bin
+	newexe source/nc neditc
 	newman doc/nedit.man nedit.1
-	newman doc/nc.man nc.1
+	newman doc/nc.man neditc.1
 
 	dodoc README ReleaseNotes ChangeLog COPYRIGHT
 	cd doc
 	dodoc *.txt nedit.doc README.FAQ NEdit.ad
 	dohtml *.{dtd,xsl,xml,html,awk}
-
 }