From fc702c8597b80aedf6514bade16219829150a480 Mon Sep 17 00:00:00 2001 From: Tim Hentenaar Date: Tue, 28 Apr 2026 11:57:49 -0400 Subject: [PATCH] geomview: change openmotif to motif and bump revision * Add a patch to fix https://trac.macports.org/ticket/69420 * Fix port linting nits --- science/geomview/Portfile | 9 +- science/geomview/files/no-finite.diff | 171 ++++++++++++++++++++++++++ 2 files changed, 176 insertions(+), 4 deletions(-) create mode 100644 science/geomview/files/no-finite.diff diff --git a/science/geomview/Portfile b/science/geomview/Portfile index 98bfe7fc463..fa1407844f1 100644 --- a/science/geomview/Portfile +++ b/science/geomview/Portfile @@ -3,6 +3,7 @@ PortGroup xcodeversion 1.0 name geomview version 1.9.5 +revision 1 categories science graphics x11 license LGPL-2.1 maintainers {raphael @raphael-st} openmaintainer @@ -17,21 +18,21 @@ long_description Geomview is an interactive 3D viewing program for Unix. \ wide selection of example objects, and you can create \ your own objects too. homepage http://www.geomview.org/ -platforms darwin master_sites sourceforge:project/geomview/geomview/${version} use_xz yes checksums rmd160 fa1b3387e096b841e8c3981ffa8d28cb3d912829 \ - sha256 dd1c2c55fb034c947792c726e241505503a896dcc609a7d51506fd47f0025402 + sha256 dd1c2c55fb034c947792c726e241505503a896dcc609a7d51506fd47f0025402 \ + size 3498220 -patchfiles patch-iobuffer.c.diff +patchfiles patch-iobuffer.c.diff no-finite.diff configure.args --without-opengl \ --with-htmlbrowser=open \ --with-pdfviewer=open -depends_lib port:openmotif \ +depends_lib port:motif \ port:zlib \ port:xorg-libXt \ port:xorg-libXmu \ diff --git a/science/geomview/files/no-finite.diff b/science/geomview/files/no-finite.diff new file mode 100644 index 00000000000..8cbeb309270 --- /dev/null +++ b/science/geomview/files/no-finite.diff @@ -0,0 +1,171 @@ +--- config.h.in 2014-03-12 19:19:05.000000000 -0400 ++++ config.h.in 2026-04-30 17:24:07.000000000 -0400 +@@ -197,9 +197,6 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_FCNTL_H + +-/* Define to 1 if you have the `finite' function. */ +-#undef HAVE_FINITE +- + /* Define to 1 if you have the `floor' function. */ + #undef HAVE_FLOOR + +@@ -669,13 +666,6 @@ + # include + #endif + +-#ifdef isfinite +-# ifdef finite +-# undef finite +-# endif +-# define finite(x) isfinite(x) +-#endif +- + #ifdef HAVE_STDBOOL_H + # include + #else +--- configure 2014-03-12 19:19:04.000000000 -0400 ++++ configure 2026-04-30 17:18:32.000000000 -0400 +@@ -19347,7 +19347,7 @@ + fi + + CPPFLAGS="${ac_gv_save_CPPFLAGS}" +-for ac_func in alarm basename bzero bcopy dirname dup2 floor fcntl finite \ ++for ac_func in alarm basename bzero bcopy dirname dup2 floor fcntl \ + gethostname getopt gettimeofday isascii mallinfo memset mkdir pow read rint \ + select sqrt strchr strcspn strdup strerror strncasecmp strpbrk \ + strrchr strstr strtol strerror sysinfo waitpid wait3 write +--- configure.ac 2014-03-12 18:38:46.000000000 -0400 ++++ configure.ac 2026-04-30 17:18:16.000000000 -0400 +@@ -69,13 +69,6 @@ + # include + #endif + +-#ifdef isfinite +-# ifdef finite +-# undef finite +-# endif +-# define finite(x) isfinite(x) +-#endif +- + #ifdef HAVE_STDBOOL_H + # include + #else +@@ -327,7 +320,7 @@ + AC_CHECK_DECLS([lseek64, llseek, lseek]) + AC_CHECK_TYPES([off64_t, loff_t, off_t]) + CPPFLAGS="${ac_gv_save_CPPFLAGS}" +-AC_CHECK_FUNCS([alarm basename bzero bcopy dirname dup2 floor fcntl finite \ ++AC_CHECK_FUNCS([alarm basename bzero bcopy dirname dup2 floor fcntl \ + gethostname getopt gettimeofday isascii mallinfo memset mkdir pow read rint \ + select sqrt strchr strcspn strdup strerror strncasecmp strpbrk \ + strrchr strstr strtol strerror sysinfo waitpid wait3 write]) +--- src/bin/geomview/common/transform.c 2014-03-12 12:51:11.000000000 -0400 ++++ src/bin/geomview/common/transform.c 2026-04-30 17:21:42.000000000 -0400 +@@ -633,7 +633,7 @@ + TmConcat(T_R, T_l, T); + TmConcat(T, T_Rinv, T); + +- if (!finite(T[0][0])) { ++ if (!isfinite(T[0][0])) { + fprintf(stderr, "Matrix is not finite!\n"); + } else { + /* Apply the matrix to the moving object */ +--- src/lib/gprim/geom/bsptree.c 2014-03-12 12:51:12.000000000 -0400 ++++ src/lib/gprim/geom/bsptree.c 2026-04-30 17:23:07.000000000 -0400 +@@ -90,7 +90,7 @@ + int i; + + for (i = 0; i < poly->n_vertices; i++) { +- if (!finite(poly->v[i]->pt.x + ++ if (!isfinite(poly->v[i]->pt.x + + poly->v[i]->pt.y + + poly->v[i]->pt.z + + poly->v[i]->pt.w)) { +@@ -1187,7 +1187,7 @@ + } else { + HPt3LinSum(mu0, &V0->pt, mu1, &V1->pt, &v0->pt); + } +- if (!finite(v0->pt.x + v0->pt.y + v0->pt.z)){ ++ if (!isfinite(v0->pt.x + v0->pt.y + v0->pt.z)){ + abort(); + } + if (poly->flags & VERT_C) { +@@ -1255,7 +1255,7 @@ + } else { + HPt3LinSum(mu0, &V0->pt, mu1, &V1->pt, &v1->pt); + } +- if (!finite(v1->pt.x + v1->pt.y + v1->pt.z)) ++ if (!isfinite(v1->pt.x + v1->pt.y + v1->pt.z)) + abort(); + if (poly->flags & VERT_C) { + CoLinSum(mu0, &V0->vcol, mu1, &V1->vcol, &v1->vcol); +@@ -1396,7 +1396,7 @@ + HPt3Coord dist; + + dist = HPt3DotPt3(v, (Point3 *)plane) - plane->w; +- if (!finite(dist)) { ++ if (!isfinite(dist)) { + dist = 1e8; /* infinity */ + } + return dist; +--- src/lib/gprim/mesh/meshbound.c 2014-03-12 12:51:12.000000000 -0400 ++++ src/lib/gprim/mesh/meshbound.c 2026-04-30 17:21:51.000000000 -0400 +@@ -44,7 +44,7 @@ + p = mesh->p; + min = *p; + +- while(--n >= 0 && !finite(p->x + p->y + p->z + p->w)) ++ while(--n >= 0 && !isfinite(p->x + p->y + p->z + p->w)) + p++; + if(n <= 0) + return NULL; /* No finite elements! */ +--- src/lib/gprim/polylist/plbound.c 2014-03-12 12:51:12.000000000 -0400 ++++ src/lib/gprim/polylist/plbound.c 2026-04-30 17:22:11.000000000 -0400 +@@ -66,7 +66,7 @@ + min = v->pt; + + /* We assume all the vertices in vl[] are actually used... */ +- while(--n >= 0 && !finite(v->pt.x + v->pt.y + v->pt.z + v->pt.w)) ++ while(--n >= 0 && !isfinite(v->pt.x + v->pt.y + v->pt.z + v->pt.w)) + v++; + if(n <= 0) + return NULL; /* No finite points */ +--- src/lib/gprim/skel/skelbound.c 2014-03-12 12:51:12.000000000 -0400 ++++ src/lib/gprim/skel/skelbound.c 2026-04-30 17:22:31.000000000 -0400 +@@ -141,7 +141,7 @@ + n = s->nvert; + p = (HPoint3 *)s->p; + +- while(--n >= 0 && !finite(p->x + p->y + p->z + p->w)) ++ while(--n >= 0 && !isfinite(p->x + p->y + p->z + p->w)) + ++p; + if(n < 0) + return NULL; +--- src/lib/gprim/vect/vectbound.c 2014-03-12 12:51:12.000000000 -0400 ++++ src/lib/gprim/vect/vectbound.c 2026-04-30 17:22:03.000000000 -0400 +@@ -51,7 +51,7 @@ + + n = v->nvert; + p = v->p; +- while(--n >= 0 && !finite(p->x + p->y + p->z + p->w)) ++ while(--n >= 0 && !isfinite(p->x + p->y + p->z + p->w)) + p++; + if(n <= 0) + return NULL; /* No (finite) points! */ +--- src/lib/oogl/util/porting.h 2014-03-12 12:51:13.000000000 -0400 ++++ src/lib/oogl/util/porting.h 2026-04-30 17:20:07.000000000 -0400 +@@ -64,13 +64,6 @@ + } + #endif + +-#if !HAVE_FINITE +-static inline int finite(double v) +-{ +- return (! (v <= 0.0 || v > 0.0)); +-} +-#endif +- + #if !HAVE_DECL_STRCASECMP + extern int strcasecmp(char *s1, char *s2); + #endif