3 files changed, 63 insertions, 13 deletions

diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index dab4fb0588e7..5df7d25b0033 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -14,6 +14,9 @@ MASTER_SITES=	SF/geomview
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An interactive viewer for 3- and 4-D geometric objects
 
+NOT_FOR_ARCHS=	amd64
+NOT_FOR_ARCHS_REASON=	Segfaults on amd64
+
 USE_MOTIF=	yes
 USE_GL=		glut
 
diff --git a/graphics/geomview/files/patch-lisp.c b/graphics/geomview/files/patch-lisp.c
index d498452c8429..f041313bf7d6 100644
--- a/graphics/geomview/files/patch-lisp.c
+++ b/graphics/geomview/files/patch-lisp.c
@@ -1,5 +1,52 @@
---- src/lib/oogl/lisp/lisp.c.orig	Fri Sep  1 15:38:16 2000
-+++ src/lib/oogl/lisp/lisp.c	Mon Aug 12 17:02:09 2002
+--- src/lib/oogl/lisp/lisp.c	2000/09/01 22:38:16	1.2
++++ src/lib/oogl/lisp/lisp.c	2006/06/26 15:41:16	1.4
+@@ -1205,9 +1205,9 @@
+ 	} else if (argclass == LARRAY) {
+ 	  /* special case for this because it takes 3 args: the base type,
+ 	     the array itself, and a count */
+-	    va_arg(a_list, LType *);
+-	    va_arg(a_list, void *);
+-	    va_arg(a_list, int *);
++	    (void)va_arg(a_list, LType *);
++	    (void)va_arg(a_list, void *);
++	    (void)va_arg(a_list, int *);
+ 
+ 	    ++argspecs;
+ 	    if (LakeMore(lake,c)) {
+@@ -1230,11 +1230,11 @@
+ 	    moreargspecs = 0;
+ 	}
+     } else if(argclass == LLAKE) {
+-	va_arg(a_list, Lake **);
++	(void)va_arg(a_list, Lake **);
+ 	LListAppend(args, LTOOBJ(LLAKE)(&lake));
+     } else {
+       ++argspecs;
+-      va_arg(a_list, void *);
++      (void)va_arg(a_list, void *);
+       if (LakeMore(lake,c)) {
+ 	LObject *arg;
+ 
+@@ -1359,8 +1359,8 @@
+ 	    args = args->cdr;
+ 	    hold = 0;
+ 	  } else {
+-	    va_arg(a_list, void *);
+-	    va_arg(a_list, void *);
++	    (void)va_arg(a_list, void *);
++	    (void)va_arg(a_list, void *);
+ 	  }
+ 	} else if(argtype == LREST) {
+ 	    LList **restp = va_arg(a_list, LList **);
+@@ -1389,7 +1389,7 @@
+ 	args = args->cdr;
+ 	hold = 0;
+       } else
+-	va_arg(a_list, void *);
++	(void)va_arg(a_list, void *);
+     }
+   }
+   if (argsrequired<0) argsrequired = argspecs;
 @@ -2110,7 +2110,7 @@
      va_list *a_list;
      unsigned long *x;
diff --git a/graphics/geomview/files/patch-streampool.h b/graphics/geomview/files/patch-streampool.h
index d5cfcaaccd16..843954a25236 100644
--- a/graphics/geomview/files/patch-streampool.h
+++ b/graphics/geomview/files/patch-streampool.h
@@ -1,11 +1,11 @@
---- src/lib/oogl/refcomm/streampool.h.orig	Mon Aug 12 17:15:10 2002
-+++ src/lib/oogl/refcomm/streampool.h	Mon Aug 12 17:15:15 2002
-@@ -29,7 +29,7 @@
- #include "config.h"
- #endif
- 
--#ifdef AIX
-+#if AIX
- # include <sys/select.h>  /* RS-6000 needs this */
- #endif
- 
+--- src/lib/oogl/refcomm/streampool.h	2006/07/14 17:47:21	1.4
++++ src/lib/oogl/refcomm/streampool.h	2006/07/15 19:06:00	1.5
+@@ -116,7 +116,7 @@
+ extern IOBFILE *PoolInputFile(Pool *);
+ extern FILE *PoolOutputFile(Pool *);
+ extern void  PoolDoReread(Pool *);
+-extern void PoolClose(register Pool *p);
++extern void PoolClose(Pool *p);
+ extern int   PoolOType(Pool *, int otype);
+ extern void  PoolSetOType(Pool *, int otype);
+ extern Pool *PoolByName(char *name);