Index: head/math/oleo/Makefile
===================================================================
--- head/math/oleo/Makefile	(revision 206918)
+++ head/math/oleo/Makefile	(revision 206919)
@@ -1,75 +1,69 @@
 # New ports collection makefile for:	oleo
 # Date created:		3 September 1994
 # Whom:			mr
 #
 # $FreeBSD$
 #
 
 PORTNAME=	oleo
 PORTVERSION=	1.99.16
 PORTREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	gahr@gahr.ch
 COMMENT=	The GNU spreadsheet for X11 and terminals
 
 USE_PERL5_BUILD=	yes
 USE_BISON=	build
 USE_AUTOTOOLS=	autoconf:213
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 CONFIGURE_ARGS=	--with-x --without-xlt --without-SciPlot
 
 INFO=		oleo
 PORTDOCS=	AUTHORS FAQ
 
 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 \
 		XmHTML:${PORTSDIR}/x11-toolkits/xmhtml
 USE_MOTIF=	yes
 CONFIGURE_ARGS+=	--with-motif
 .else
 USE_XLIB=	yes
 CONFIGURE_ARGS+=	--without-motif
 .endif
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB=	NLS="@comment "
 .else
 USE_GETTEXT=	yes
 PLIST_SUB=	NLS=""
 .endif
 
 post-patch:
 	@${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
 		's|malloc\.h|stdlib.h|g'
 .for pof in en fr nl
 	@${REINPLACE_CMD} -e "s|CHARSET|ISO-8859-1|;s|ENCODING|8bit|"	\
 		${WRKSRC}/po/${pof}.po
 .endfor
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e "s|am: install-docDATA|am:|" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|install-info-am install-htmlDATA|install-info-am|" \
 		${WRKSRC}/doc/Makefile.in
 .endif
 
 pre-build:
 .for file in src/io-term.c
 	cd ${WRKSRC} && ${MV} ${file} ${file}.pre_iconv \
 		&& iconv -c -t ascii ${file}.pre_iconv > ${file} || ${TRUE}
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Property changes on: head/math/oleo/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.54
\ No newline at end of property
+1.55
\ No newline at end of property
Index: head/math/oleo/files/patch-src_basic.h
===================================================================
--- head/math/oleo/files/patch-src_basic.h	(nonexistent)
+++ head/math/oleo/files/patch-src_basic.h	(revision 206919)
@@ -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;
+ 

Property changes on: head/math/oleo/files/patch-src_basic.h
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/math/oleo/files/patch-src_io-term.c
===================================================================
--- head/math/oleo/files/patch-src_io-term.c	(nonexistent)
+++ head/math/oleo/files/patch-src_io-term.c	(revision 206919)
@@ -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;

Property changes on: head/math/oleo/files/patch-src_io-term.c
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/math/oleo/files/patch-src_io-term.h
===================================================================
--- head/math/oleo/files/patch-src_io-term.h	(nonexistent)
+++ head/math/oleo/files/patch-src_io-term.h	(revision 206919)
@@ -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;

Property changes on: head/math/oleo/files/patch-src_io-term.h
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property