ports/120415: [patch] math/oleo unbreak fix build with GCC 4.2 + adopt maintainship

[Pietro Cerutti]

>Number:         120415
>Category:       ports
>Synopsis:       [patch] math/oleo unbreak fix build with GCC 4.2 + adopt maintainship
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 08 16:00:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Pietro Cerutti
>Release:        FreeBSD 8.0-CURRENT i386
>Organization:
>Environment:


System: FreeBSD 8.0-CURRENT #2: Fri Feb  8 02:46:14 CET 2008
    root at gahrtop.localhost:/usr/obj/usr/src/sys/MSI1034



>Description:


- fix a few things which are not accepted anymore in GCC 4.2
- set maintainship to me


>How-To-Repeat:





>Fix:


--- _oleo.diff begins here ---
--- /dev/null	2008-02-08 16:46:19.000000000 +0100
+++ files/patch-src_basic.h	2008-02-08 16:42:41.000000000 +0100
@@ -0,0 +1,12 @@
+--- src/basic.h.orig	2008-02-08 16:40:42.000000000 +0100
++++ src/basic.h	2008-02-08 16:40:48.000000000 +0100
+@@ -36,9 +36,6 @@
+ 
+ extern const int colmagic[9];
+ extern  const int rowmagic[9];
+-extern char * motion_name[9];
+-extern enum motion_magic complementary_motion[9];
+-extern enum motion_magic opposite_motion[9];
+ 
+ extern int run_load_hooks;
+ 
--- /dev/null	2008-02-08 16:46:19.000000000 +0100
+++ files/patch-src_io-term.c	2008-02-08 16:45:26.000000000 +0100
@@ -0,0 +1,25 @@
+--- src/io-term.c.orig	2008-02-08 16:43:28.000000000 +0100
++++ src/io-term.c	2008-02-08 16:45:06.000000000 +0100
+@@ -220,6 +220,7 @@
+ {
+   int	set_opt = 1;
+   int	i, l;
++  int *tmp;
+   char	*p;
+ 
+   while (*ptr == ' ')
+@@ -234,9 +235,11 @@
+ 
+ 		if (Preferences[i].copynext) {
+ 			ptr += strlen(Preferences[i].name) + 1;
+-			((char *)Preferences[i].var) = strdup(ptr);
+-		} else if (Preferences[i].var)
+-			*((int *)Preferences[i].var) = Preferences[i].value;
++			Preferences[i].var = strdup(ptr);
++		} else if (Preferences[i].var) {
++         tmp = Preferences[i].var;
++			*tmp = Preferences[i].value;
++      }
+ 
+ 		if (Preferences[i].cont == 0)
+ 			return 1;
--- /dev/null	2008-02-08 16:46:19.000000000 +0100
+++ files/patch-src_io-term.h	2008-02-08 16:41:54.000000000 +0100
@@ -0,0 +1,10 @@
+--- src/io-term.h.orig	2008-02-08 16:38:59.000000000 +0100
++++ src/io-term.h	2008-02-08 16:38:48.000000000 +0100
+@@ -21,6 +21,7 @@
+  */
+ 
+ #include <setjmp.h>
++#include "funcs.h"
+ #include "global.h"
+ 
+ extern int using_x;
--- Makefile.orig	2008-02-08 16:31:28.000000000 +0100
+++ Makefile	2008-02-08 16:48:53.000000000 +0100
@@ -12,7 +12,7 @@
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	gahr at gahr.ch
 COMMENT=	The GNU spreadsheet for X11 and terminals
 
 USE_PERL5_BUILD=	yes
@@ -28,12 +28,6 @@
 OPTIONS=	MOTIF "Motif support" off \
 		NLS "NLS support" on
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN=		Broken with gcc 4.2
-.endif
-
 .if defined(WITH_MOTIF)
 LIB_DEPENDS+=	plot:${PORTSDIR}/graphics/plotutils \
 		Xbae:${PORTSDIR}/x11-toolkits/xbae \
@@ -72,4 +66,4 @@
 		&& iconv -c -t ascii ${file}.pre_iconv > ${file} || ${TRUE}
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- _oleo.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: