From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 22 06:30:03 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C117616A41F for ; Tue, 22 May 2007 06:30:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 9BA4413C468 for ; Tue, 22 May 2007 06:30:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l4M6U34R074128 for ; Tue, 22 May 2007 06:30:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l4M6U3YV074127; Tue, 22 May 2007 06:30:03 GMT (envelope-from gnats) Resent-Date: Tue, 22 May 2007 06:30:03 GMT Resent-Message-Id: <200705220630.l4M6U3YV074127@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Xin LI Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 486E216A468 for ; Tue, 22 May 2007 06:23:47 +0000 (UTC) (envelope-from delphij@tarsier.delphij.net) Received: from tarsier.geekcn.org (tarsier.geekcn.org [210.51.165.229]) by mx1.freebsd.org (Postfix) with ESMTP id ED91813C4B7 for ; Tue, 22 May 2007 06:23:45 +0000 (UTC) (envelope-from delphij@tarsier.delphij.net) Received: from localhost (tarsier.geekcn.org [210.51.165.229]) by tarsier.geekcn.org (Postfix) with ESMTP id EA95EEB0BCD; Tue, 22 May 2007 14:23:44 +0800 (CST) Received: from tarsier.geekcn.org ([210.51.165.229]) by localhost (mail.geekcn.org [210.51.165.229]) (amavisd-new, port 10024) with ESMTP id RHDzZrXCYM2k; Tue, 22 May 2007 14:23:39 +0800 (CST) Received: from tarsier.delphij.net (tarsier.geekcn.org [210.51.165.229]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by tarsier.geekcn.org (Postfix) with ESMTP id DD7BAEB091C; Tue, 22 May 2007 14:23:37 +0800 (CST) Received: from tarsier.delphij.net (localhost [127.0.0.1]) by tarsier.delphij.net (8.13.8/8.13.8) with ESMTP id l4M6Nb1t082439; Tue, 22 May 2007 14:23:37 +0800 (CST) (envelope-from delphij@tarsier.delphij.net) Received: (from delphij@localhost) by tarsier.delphij.net (8.13.8/8.13.8/Submit) id l4M6NVcm082416; Tue, 22 May 2007 14:23:31 +0800 (CST) (envelope-from delphij) Message-Id: <200705220623.l4M6NVcm082416@tarsier.delphij.net> Date: Tue, 22 May 2007 14:23:31 +0800 (CST) From: Xin LI To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: hoek@FreeBSD.org Subject: ports/112847: [PATCH] Fix build for sysutils/44bsd-more X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Xin LI List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 May 2007 06:30:03 -0000 >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: