- 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.

PR:		126037
Submitted by:	"Pedro F. Giffuni" <pfgshield-freebsd at yahoo dot com>
This commit is contained in:
Dmitry Marakasov 2008-09-03 01:45:10 +00:00
parent 23c844c03f
commit e811ca283e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=219703
3 changed files with 63 additions and 13 deletions

View file

@ -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

View file

@ -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;

View file

@ -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);