mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-25 04:43:33 +00:00
- Update to 1.9.4
PR: 130443 Submitted by: KATO Tsuguru <tkato432@yahoo.com>
This commit is contained in:
parent
e2099594b6
commit
d80716024b
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=226063
@ -6,10 +6,9 @@
|
||||
#
|
||||
|
||||
PORTNAME= geomview
|
||||
PORTVERSION= 1.8.1
|
||||
PORTREVISION= 4
|
||||
PORTVERSION= 1.9.4
|
||||
CATEGORIES= graphics
|
||||
MASTER_SITES= SF/geomview
|
||||
MASTER_SITES= SF
|
||||
|
||||
MAINTAINER= ports@FreeBSD.org
|
||||
COMMENT= An interactive viewer for 3- and 4-D geometric objects
|
||||
@ -17,62 +16,73 @@ COMMENT= An interactive viewer for 3- and 4-D geometric objects
|
||||
NOT_FOR_ARCHS= amd64
|
||||
NOT_FOR_ARCHS_REASON= Segfaults on amd64
|
||||
|
||||
OPTIONS= MOTION_AVG "Use experimental motion averaging code" off
|
||||
|
||||
USE_BZIP2= yes
|
||||
USE_MOTIF= yes
|
||||
USE_GL= glut
|
||||
USE_GL= glu
|
||||
USE_AUTOTOOLS= libtool:15
|
||||
CONFIGURE_ARGS= --with-motif=${LOCALBASE} --with-opengl=${LOCALBASE}
|
||||
USE_LDCONFIG= yes
|
||||
|
||||
USE_AUTOTOOLS= autoconf:213
|
||||
PLIST_SUB= VERSION="${PORTVERSION}"
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
CONFIGURE_ARGS= --with-opengl=${LOCALBASE}
|
||||
|
||||
MANCOMPRESSED= no
|
||||
MAN1= geomview.1 togeomview.1 bdy.1 oogl2rib.1 anytooff.1 \
|
||||
bez2mesh.1 offconsol.1 polymerge.1 vrml2oogl.1 clip.1 \
|
||||
math2oogl.1 oogl2vrml.1 anytoucd.1 ucdtooff.1
|
||||
MAN3= lisp.3
|
||||
MAN5= oogl.5 geomview.5
|
||||
|
||||
INFO= geomview-7 geomview-6 geomview-5 geomview-4 geomview-3 \
|
||||
geomview-2 geomview-1 geomview
|
||||
|
||||
MAN_FILES= oogl.5 geomview.5
|
||||
DOC_FILES= gvplot.txt oogltour OOGL.m.txt README
|
||||
|
||||
EXAMPLE_FILES= example1.c example2.c example3.c example4.tcl
|
||||
MAN1= animate.1gv anytooff.1gv anytoucd.1gv bdy.1gv bez2mesh.1gv \
|
||||
clip.1gv geomview.1gv hvectext.1gv math2oogl.1gv nose.1gv \
|
||||
offconsol.1gv oogl2rib.1gv oogl2vrml.1gv polymerge.1gv \
|
||||
togeomview.1gv ucdtooff.1gv vrml2oogl.1gv
|
||||
MAN3= anytopl.3gv bdy.3gv fsaparse.3gv geomutil.3gv lisp.3gv \
|
||||
plcombine.3gv plconsol.3gv
|
||||
MAN5= discgrp.5gv geomview.5gv oogl.5gv
|
||||
INFO= geomview
|
||||
|
||||
# Set "CPU" type for Geomview make
|
||||
# Allow user to specify "make install MAPLE_LIB=foo" as geomview wants
|
||||
MAKE_ENV= CPU=FreeBSD MAPLE_LIB=${MAPLE_LIB}
|
||||
|
||||
AC_FAKE_FILES= aclocal.m4 config.h.in stamp-h stamp-h.in
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
post-configure:
|
||||
cd ${WRKSRC}; ${TOUCH} ${AC_FAKE_FILES}
|
||||
${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${TOUCH}
|
||||
|
||||
post-install:
|
||||
${MKDIR} ${EXAMPLESDIR}
|
||||
.for i in ${EXAMPLE_FILES}
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/${i} ${EXAMPLESDIR}
|
||||
.endfor
|
||||
.for i in ${MAN3}
|
||||
${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/man/man3
|
||||
.endfor
|
||||
.for i in ${MAN5}
|
||||
${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/man/man5
|
||||
.endfor
|
||||
.if !defined(NOPORTDOCS)
|
||||
${MKDIR} ${DOCSDIR} ${DOCSDIR}/figs ${DOCSDIR}/html \
|
||||
${DOCSDIR}/html/pix
|
||||
.for i in ${DOC_FILES}
|
||||
${INSTALL_MAN} ${WRKSRC}/doc/${i} ${DOCSDIR}
|
||||
.endfor
|
||||
${INSTALL_MAN} ${WRKSRC}/doc/figs/*.ps ${DOCSDIR}/figs
|
||||
${INSTALL_MAN} ${WRKSRC}/doc/html/*.html ${DOCSDIR}/html
|
||||
${INSTALL_MAN} ${WRKSRC}/doc/html/pix/*.gif ${DOCSDIR}/html/pix
|
||||
.for i in ${INFO}
|
||||
${MV} ${PREFIX}/info/${i} ${PREFIX}/info/${i}.info
|
||||
.endfor
|
||||
.if defined(WITH_MOTION_AVG)
|
||||
CONFIGURE_ARGS+= --enable-motion-averaging
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e '/^SUBDIRS =/s|doc||g' ${WRKSRC}/Makefile.in
|
||||
.for i in src/bin/geomutil/math2oogl/Makefile.in \
|
||||
src/bin/geomutil/maple2oogl/Makefile.in
|
||||
@${REINPLACE_CMD} -e \
|
||||
'/^install-data-am:/s|install-docDATA||g' ${WRKSRC}/${i}
|
||||
.endfor
|
||||
|
||||
post-build:
|
||||
cd ${WRKSRC}/doc && /usr/bin/makeinfo --no-split --no-validate \
|
||||
-o geomview.info geomview.texi
|
||||
|
||||
post-install:
|
||||
cd ${WRKSRC}/doc && ${INSTALL_MAN} *.3gv ${MAN3PREFIX}/man/man3
|
||||
cd ${WRKSRC}/doc && ${INSTALL_MAN} *.5gv ${MAN5PREFIX}/man/man5
|
||||
cd ${WRKSRC}/doc && ${INSTALL_DATA} *.info ${PREFIX}/${INFO_PATH}
|
||||
.if !defined(NOPORTDOCS)
|
||||
@${MKDIR} ${DOCSDIR}
|
||||
.for i in OOGL.m.txt README README.gvplot geomview.pdf geomview-pt_BR.pdf \
|
||||
oogltour oogltour-pt_BR
|
||||
cd ${WRKSRC}/doc && ${INSTALL_DATA} ${i} ${DOCSDIR}
|
||||
.endfor
|
||||
@${MKDIR} ${DOCSDIR}/html
|
||||
cd ${WRKSRC}/doc/geomview.html \
|
||||
&& ${INSTALL_DATA} *.html ${DOCSDIR}/html
|
||||
@${MKDIR} ${DOCSDIR}/html/figs
|
||||
cd ${WRKSRC}/doc/figs \
|
||||
&& ${INSTALL_DATA} *.png ${DOCSDIR}/html/figs
|
||||
@${MKDIR} ${DOCSDIR}/html/pt_BR
|
||||
cd ${WRKSRC}/doc/geomview-pt_BR.html \
|
||||
&& ${INSTALL_DATA} *.html ${DOCSDIR}/html/pt_BR
|
||||
cd ${DOCSDIR}/html/pt_BR && ${LN} -sf ../figs .
|
||||
.endif
|
||||
.if !defined(NOPORTEXAMPLES)
|
||||
@${MKDIR} ${EXAMPLESDIR}
|
||||
cd ${WRKSRC}/doc && ${INSTALL_DATA} *.c ${EXAMPLESDIR}
|
||||
cd ${WRKSRC}/doc && ${INSTALL_DATA} *.tcl ${EXAMPLESDIR}
|
||||
.endif
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
|
@ -1,3 +1,3 @@
|
||||
MD5 (geomview-1.8.1.tar.gz) = 1cb0e07a6552e9fe122491af70171536
|
||||
SHA256 (geomview-1.8.1.tar.gz) = 4e65674b4a06b2042067003b5113eafd78b675748d4b572ee55c3ac93222703f
|
||||
SIZE (geomview-1.8.1.tar.gz) = 2766832
|
||||
MD5 (geomview-1.9.4.tar.bz2) = 4da5a241a068b362c819ecca419d1f3d
|
||||
SHA256 (geomview-1.9.4.tar.bz2) = a384790429541b8c86c41c4b27d157d5a92ee7c46e6a78741e55d81bd9a46c5b
|
||||
SIZE (geomview-1.9.4.tar.bz2) = 4037982
|
||||
|
@ -1,46 +0,0 @@
|
||||
--- configure.in.orig Sun Mar 25 17:56:01 2001
|
||||
+++ configure.in Mon Aug 12 18:07:49 2002
|
||||
@@ -433,6 +433,10 @@
|
||||
AC_DEFINE(unix, 1)
|
||||
AC_DEFINE(alloca, __alloca)
|
||||
;;
|
||||
+*freebsd*) MACHTYPE=$target_os
|
||||
+ AC_DEFINE_UNQUOTED(MACHTYPE, "$MACHTYPE")
|
||||
+ AC_DEFINE(alloca, alloca) dnl work around flawed GNU assumption
|
||||
+ ;;
|
||||
*) MACHTYPE=$target_os
|
||||
AC_DEFINE_UNQUOTED(MACHTYPE, "$MACHTYPE")
|
||||
;;
|
||||
@@ -459,7 +463,8 @@
|
||||
# mbp Mon May 8 18:47:33 2000
|
||||
AC_MSG_CHECKING([whether we need to link -lm to get math functions])
|
||||
AC_TRY_LINK([ #include <math.h> ],
|
||||
- [ double s = sin(1.5); ],
|
||||
+ [ double s = sin(1.5);
|
||||
+ return ((int)s); ],
|
||||
[ MATHLIB=""
|
||||
AC_MSG_RESULT([no]) ],
|
||||
[ MATHLIB=-lm
|
||||
@@ -471,7 +476,8 @@
|
||||
|
||||
|
||||
AC_MSG_CHECKING([whether we need to link -lsocket to get socket()])
|
||||
-AC_TRY_LINK([ #include <sys/socket.h> ],
|
||||
+AC_TRY_LINK([ #include <sys/types.h>
|
||||
+ #include <sys/socket.h> ],
|
||||
[ int s = socket(AF_UNIX, SOCK_STREAM, 0); ],
|
||||
[ SOCKETLIBS=""
|
||||
AC_MSG_RESULT([no]) ],
|
||||
@@ -491,10 +497,10 @@
|
||||
|
||||
AC_CHECK_HEADERS(fpu_control.h i386/fpu_control.h netinet/in.h)
|
||||
|
||||
-moduledir="\$(exec_prefix)/bin"
|
||||
+moduledir="\$(exec_prefix)/libexec/geomview/modules"
|
||||
AC_SUBST(moduledir)
|
||||
|
||||
-geomdatadir="\$(prefix)/data"
|
||||
+geomdatadir="\$(prefix)/share/geomview/data"
|
||||
AC_SUBST(geomdatadir)
|
||||
|
||||
# cache 'moduledir' and 'geomdatadir' so individual module configure scripts
|
@ -1,58 +0,0 @@
|
||||
--- 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;
|
||||
{
|
||||
- *x = va_arg(*a_list, ulong);
|
||||
+ *x = va_arg(*a_list, unsigned long);
|
||||
}
|
||||
|
||||
LObject *ulongparse(Lake *lake)
|
@ -1,11 +0,0 @@
|
||||
--- 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);
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user