Date: Tue, 22 May 2007 14:23:31 +0800 (CST) From: Xin LI <delphij@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: hoek@FreeBSD.org Subject: ports/112847: [PATCH] Fix build for sysutils/44bsd-more Message-ID: <200705220623.l4M6NVcm082416@tarsier.delphij.net> Resent-Message-ID: <200705220630.l4M6U3YV074127@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 112847
>Category: ports
>Synopsis: [PATCH] Fix build for sysutils/44bsd-more
>Confidential: no
>Severity: serious
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue May 22 06:30:02 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Xin LI
>Release: FreeBSD 6.2-RELEASE-p1 i386
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD tarsier.delphij.net 6.2-RELEASE-p1 FreeBSD 6.2-RELEASE-p1 #1: Sat Feb 10 07:03:45 CST 2007 delphij@tarsier.delphij.net:/usr/obj/usr/src/sys/TARSIER i386
>Description:
As per pointyhat via kris@
>How-To-Repeat:
>Fix:
--- patch-44bsd-more.diff begins here ---
Index: files/patch-main.c
===================================================================
RCS file: /home/ncvs/ports/sysutils/44bsd-more/files/patch-main.c,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-main.c
--- files/patch-main.c 18 Aug 2003 03:03:22 -0000 1.1
+++ files/patch-main.c 22 May 2007 06:20:00 -0000
@@ -1,5 +1,5 @@
--- main.c.orig Tue Aug 5 17:17:15 2003
-+++ main.c Tue Aug 5 17:21:34 2003
++++ main.c Tue May 22 14:15:18 2007
@@ -33,9 +33,9 @@
*/
@@ -12,3 +12,20 @@
Regents of the University of California. All rights reserved.\n";
#endif /* not lint */
+@@ -68,6 +68,8 @@
+ #include "less.h"
+ #include "pathnames.h"
+
++static int str_read(void *, char *, size_t);
++
+ int ispipe;
+ char *current_file, *previous_file, *current_name, *next_name;
+ int any_display;
+@@ -410,7 +412,6 @@
+ char *c;
+ int readrc();
+ int savederrno;
+- static int str_read();
+
+ /* The default builtin rc file */
+ if ((c = getenv("HOME")) &&
Index: files/patch-ncommand.c
===================================================================
RCS file: files/patch-ncommand.c
diff -N files/patch-ncommand.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-ncommand.c 22 May 2007 06:18:23 -0000
@@ -0,0 +1,18 @@
+--- ./ncommand.c.orig Tue May 22 14:18:10 2007
++++ ./ncommand.c Tue May 22 14:17:26 2007
+@@ -231,6 +231,7 @@
+ */
+
+ static char *readvar();
++static char *getvar(char *, int);
+
+ #define NCTXTS 128
+ void *getstr_ctxts[NCTXTS]; /* could easily be made dynamic... */
+@@ -613,7 +614,6 @@
+ {
+ int vlength;
+ char *vstart;
+- static char *getvar();
+
+ if (**line != '{') {
+ SETERR (E_BADVAR);
--- patch-44bsd-more.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200705220623.l4M6NVcm082416>