ports/126037: graphics/geomview: fix build, label broken on amd64

[Pedro F. Giffuni]

>Number:         126037
>Category:       ports
>Synopsis:       graphics/geomview: fix build, label broken on amd64
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 28 14:50:03 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Pedro F. Giffuni
>Release:        6.3-Release
>Organization:
>Environment:
%uname -a
FreeBSD kakumen.cable.net.co 6.3-RELEASE FreeBSD 6.3-RELEASE #10: Sat Jan 19 01:13:55 COT 2008     root at kakumen.cable.net.co:/usr/src/sys/amd64/compile/SMP  amd64

>Description:
- Fix a typo on this port that enables it to build again.
- Label NOT_FOR AMD64 since it coredumps.
- Sync the patches with those on CVS.
- No functional change.
>How-To-Repeat:

>Fix:
diff -ruN geomview.orig/Makefile geomview/Makefile
--- geomview.orig/Makefile	2008-07-20 23:21:35.000000000 -0500
+++ geomview/Makefile	2008-07-28 09:39:35.000000000 -0500
@@ -14,8 +14,11 @@
 MAINTAINER=	bms at FreeBSD.org
 COMMENT=	An interactive viewer for 3- and 4-D geometric objects
 
+NOT_FOR_ARCHS=	amd64
+NOT_FOR_ARCHS_REASON=	'Signal 11, Segmentation fault'
+
 USE_MOTIF=	yes
-USE_XORG=	glut
+USE_GL=	glut
 
 USE_AUTOTOOLS=	autoconf:213
 
diff -ruN geomview.orig/files/patch-lisp.c geomview/files/patch-lisp.c
--- geomview.orig/files/patch-lisp.c	2008-07-20 23:21:35.000000000 -0500
+++ geomview/files/patch-lisp.c	2008-07-21 10:48:31.000000000 -0500
@@ -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 -ruN geomview.orig/files/patch-streampool.h geomview/files/patch-streampool.h
--- geomview.orig/files/patch-streampool.h	2008-07-20 23:21:35.000000000 -0500
+++ geomview/files/patch-streampool.h	2008-07-21 10:45:35.000000000 -0500
@@ -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);


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