Date: Fri, 30 Nov 2007 12:55:02 GMT From: "Philip M. Gollucci" <pgollucci@p6m7g8.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/118352: editors/puff: [PATCH]: GCC4.1 fix, unbreak 7.x Message-ID: <200711301255.lAUCt2gI040853@www.freebsd.org> Resent-Message-ID: <200711301301.lAUD1CLU050278@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.pre.mk>
-
-.if (${OSVERSION} >= 700000)
-BROKEN= Does not compile on 7.X
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200711301255.lAUCt2gI040853>