A struct option patch (hmm do we have a header problem)

4 files changed, 179 insertions, 2 deletions

diff --git a/sys-apps/less/files/digest-less-358-r4 b/sys-apps/less/files/digest-less-358-r4
new file mode 100644
index 000000000000..9832374f6dc5
--- /dev/null
+++ b/sys-apps/less/files/digest-less-358-r4
@@ -0,0 +1 @@
+MD5 692a94060a50dd35a4d65176cb899444 less-358.tar.gz 233472
diff --git a/sys-apps/less/files/less-358-gentoo.diff b/sys-apps/less/files/less-358-gentoo.diff
new file mode 100644
index 000000000000..6752d5d0cb51
--- /dev/null
+++ b/sys-apps/less/files/less-358-gentoo.diff
@@ -0,0 +1,138 @@
+--- command.c~	Thu Nov 15 14:46:39 2001
++++ command.c	Thu Nov 15 14:47:42 2001
+@@ -356,7 +356,7 @@
+ 			 * If so, display the complete name and stop 
+ 			 * accepting chars until user hits RETURN.
+ 			 */
+-			struct option *o;
++			struct option2 *o;
+ 			char *oname;
+ 			int lc;
+ 
+--- funcs.h~	Sun Jul  9 00:28:04 2000
++++ funcs.h	Thu Nov 15 14:49:19 2001
+@@ -186,8 +186,8 @@
+ 	public void nopendopt ();
+ 	public int getnum ();
+ 	public void init_option ();
+-	public struct option * findopt ();
+-	public struct option * findopt_name ();
++	public struct option2 * findopt ();
++	public struct option2 * findopt_name ();
+ 	public int iread ();
+ 	public void intread ();
+ 	public long get_time ();
+--- option.c~	Sun Jul  9 00:26:47 2000
++++ option.c	Thu Nov 15 14:48:09 2001
+@@ -21,7 +21,7 @@
+ #include "less.h"
+ #include "option.h"
+ 
+-static struct option *pendopt;
++static struct option2 *pendopt;
+ public int plusoption = FALSE;
+ 
+ static char *propt();
+@@ -39,7 +39,7 @@
+ scan_option(s)
+ 	char *s;
+ {
+-	register struct option *o;
++	register struct option2 *o;
+ 	register int optc;
+ 	char *optname;
+ 	char *printopt;
+@@ -259,7 +259,7 @@
+ 	char *s;
+ 	int how_toggle;
+ {
+-	register struct option *o;
++	register struct option2 *o;
+ 	register int num;
+ 	int no_prompt;
+ 	int err;
+@@ -479,7 +479,7 @@
+ single_char_option(c)
+ 	int c;
+ {
+-	register struct option *o;
++	register struct option2 *o;
+ 
+ 	o = findopt(c);
+ 	if (o == NULL)
+@@ -495,7 +495,7 @@
+ opt_prompt(c)
+ 	int c;
+ {
+-	register struct option *o;
++	register struct option2 *o;
+ 
+ 	o = findopt(c);
+ 	if (o == NULL || (o->otype & (STRING|NUMBER)) == 0)
+--- option.h~	Sun Jul  9 00:26:47 2000
++++ option.h	Thu Nov 15 14:46:53 2001
+@@ -49,7 +49,7 @@
+ 	struct optname *onext;  /* List of synonymous option names */
+ };
+ 
+-struct option
++struct option2
+ {
+ 	char oletter;		/* The controlling letter (a-z) */
+ 	struct optname *onames; /* Long (GNU-style) option name */
+--- opttbl.c~	Sun Jul  9 00:26:47 2000
++++ opttbl.c	Thu Nov 15 14:48:56 2001
+@@ -107,7 +107,7 @@
+ /*
+  * Table of all options and their semantics.
+  */
+-static struct option option[] =
++static struct option2 option[] =
+ {
+ 	{ 'a', &a_optname,
+ 		BOOL, OPT_OFF, &how_search, NULL,
+@@ -340,7 +340,7 @@
+ 	public void
+ init_option()
+ {
+-	register struct option *o;
++	register struct option2 *o;
+ 
+ 	for (o = option;  o->oletter != '\0';  o++)
+ 	{
+@@ -355,11 +355,11 @@
+ /*
+  * Find an option in the option table, given its option letter.
+  */
+-	public struct option *
++	public struct option2 *
+ findopt(c)
+ 	int c;
+ {
+-	register struct option *o;
++	register struct option2 *o;
+ 
+ 	for (o = option;  o->oletter != '\0';  o++)
+ 	{
+@@ -377,18 +377,18 @@
+  * is updated to point after the matched name.
+  * p_oname if non-NULL is set to point to the full option name.
+  */
+-	public struct option *
++	public struct option2 *
+ findopt_name(p_optname, p_oname, p_err)
+ 	char **p_optname;
+ 	char **p_oname;
+ 	int *p_err;
+ {
+ 	char *optname = *p_optname;
+-	register struct option *o;
++	register struct option2 *o;
+ 	register struct optname *oname;
+ 	register int len;
+ 	int uppercase;
+-	struct option *maxo = NULL;
++	struct option2 *maxo = NULL;
+ 	struct optname *maxoname = NULL;
+ 	int maxlen = 0;
+ 	int ambig = 0;
diff --git a/sys-apps/less/less-358-r3.ebuild b/sys-apps/less/less-358-r3.ebuild
index f253a7a3f2e3..83a81ca7eb7c 100644
--- a/sys-apps/less/less-358-r3.ebuild
+++ b/sys-apps/less/less-358-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-358-r3.ebuild,v 1.1 2001/11/02 10:19:58 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-358-r3.ebuild,v 1.2 2001/11/15 13:55:27 achim Exp $
 
 DESCRIPTION="Excellent text file viewer"
 HOMEPAGE="http://www.gnu.org/software/less/less.html"
@@ -18,7 +18,7 @@ src_compile() {
 	./configure \
 	--host=${CHOST} --prefix=/usr || die
 
-	emake || die
+	make || die
 }
 
 src_install() {
diff --git a/sys-apps/less/less-358-r4.ebuild b/sys-apps/less/less-358-r4.ebuild
new file mode 100644
index 000000000000..e827f3eb2961
--- /dev/null
+++ b/sys-apps/less/less-358-r4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-358-r4.ebuild,v 1.1 2001/11/15 13:55:27 achim Exp $
+
+DESCRIPTION="Excellent text file viewer"
+HOMEPAGE="http://www.gnu.org/software/less/less.html"
+
+S=${WORKDIR}/${P}
+SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/less/${P}.tar.gz
+	ftp://ftp.gnu.org/pub/gnu/less/${P}.tar.gz"
+
+DEPEND="virtual/glibc
+	>=sys-libs/ncurses-5.2"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	patch -p0 <${FILESDIR}/${P}-gentoo.diff
+}
+
+src_compile() {
+
+	./configure \
+	--host=${CHOST} --prefix=/usr || die
+
+	make || die
+}
+
+src_install() {
+
+	dobin less lessecho lesskey
+	exeinto /usr/bin ; doexe ${FILESDIR}/lesspipe.sh
+
+	dodoc COPYING NEWS README LICENSE
+	newman lesskey.nro lesskey.1
+	newman less.nro less.1
+}