From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Nov 30 13:03:23 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B618716A419 for ; Fri, 30 Nov 2007 13:03:23 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 8893113C46B for ; Fri, 30 Nov 2007 13:02:17 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id lAUD1CGs050279 for ; Fri, 30 Nov 2007 13:01:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id lAUD1CLU050278; Fri, 30 Nov 2007 13:01:12 GMT (envelope-from gnats) Resent-Date: Fri, 30 Nov 2007 13:01:12 GMT Resent-Message-Id: <200711301301.lAUD1CLU050278@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, "Philip M. Gollucci" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E197416A420 for ; Fri, 30 Nov 2007 12:57:26 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id C549513C46A for ; Fri, 30 Nov 2007 12:56:20 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id lAUCt2TV040854 for ; Fri, 30 Nov 2007 12:55:02 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id lAUCt2gI040853; Fri, 30 Nov 2007 12:55:02 GMT (envelope-from nobody) Message-Id: <200711301255.lAUCt2gI040853@www.freebsd.org> Date: Fri, 30 Nov 2007 12:55:02 GMT From: "Philip M. Gollucci" To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/118352: editors/puff: [PATCH]: GCC4.1 fix, unbreak 7.x X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Nov 2007 13:03:23 -0000 >Number: 118352 >Category: ports >Synopsis: editors/puff: [PATCH]: GCC4.1 fix, unbreak 7.x >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Nov 30 13:00:06 UTC 2007 >Closed-Date: >Last-Modified: >Originator: Philip M. Gollucci >Release: 8.0-CURRENT >Organization: Riderway Inc. >Environment: FreeBSD philip.hq.rws 8.0-CURRENT FreeBSD 8.0-CURRENT #0: Tue Nov 6 16:28:12 EST 2007 pgollucci@philip.hq.rws:/usr/obj/usr/src/sys/RIDERWAY i386 >Description: GCC4.1 fixes. >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/editors/puff/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- Makefile 3 Apr 2007 16:23:48 -0000 1.13 +++ Makefile 30 Nov 2007 12:48:07 -0000 @@ -16,10 +16,4 @@ PLIST_FILES= bin/puff etc/puff.conf.sample -.include - -.if (${OSVERSION} >= 700000) -BROKEN= Does not compile on 7.X -.endif - -.include +.include cvs diff: files/patch-keys.c is a new entry, no comparison available cvs diff: files/patch-keys.h is a new entry, no comparison available --- /dev/null 2007-11-30 12:44:02.000000000 +0000 +++ files/patch-keys.h 2007-11-30 12:52:23.000000000 +0000 @@ -0,0 +1,12 @@ +--- ./keys.h.orig 2007-11-30 12:52:12.000000000 +0000 ++++ ./keys.h 2007-11-30 12:51:44.000000000 +0000 +@@ -41,7 +41,8 @@ + #endif + #define KLAST 551 + +-extern int keys[1024][10], definedkeys; ++int keys[1024][10]; ++int definedkeys; + + int strmatch(char *s1, char *s2); + void tab_file(char *string, int maxsize); --- /dev/null 2007-11-30 12:44:02.000000000 +0000 +++ files/patch-keys.c 2007-11-30 12:52:23.000000000 +0000 @@ -0,0 +1,13 @@ +--- ./keys.c.orig 2007-11-30 12:52:17.000000000 +0000 ++++ ./keys.c 2007-11-30 12:51:35.000000000 +0000 +@@ -8,10 +8,6 @@ + #include "keys.h" + #include "shared.h" + +-/* the first int is the return value, the rest are what escape string will +- * match it. Escape strings are ended with -1. */ +-int keys[][], definedkeys = 0; +- + int kgetkey(WINDOW *win) { + int thiskey[10], loop, match = 1, found = 1; + struct stat sb; >Release-Note: >Audit-Trail: >Unformatted: