xmgr: change openmotif to motif and bump revision

* Add a patch to fix missing inclusion of string.h
* Add a patch to fix main prototypes in configure
* Add args to point configure to the X headers/libs
* Disable livecheck as upstream development is frozen
* Fix port linting nits
This commit is contained in:
Tim Hentenaar
2026-04-28 11:56:25 -04:00
committed by Renee Otten
parent f2deb2ebac
commit 0e9e4c4ca8
4 changed files with 224 additions and 9 deletions
+21 -9
View File
@@ -2,7 +2,7 @@ PortSystem 1.0
name xmgr
version 4.1.2
revision 3
revision 4
categories math science
license BSD
maintainers nomaintainer
@@ -15,25 +15,35 @@ long_description ACE/gr, also known as Xmgr, is a 2D plotting tool for the X
updated UI in Grace.
homepage http://plasma-gate.weizmann.ac.il/Xmgr/
platforms darwin
patchfiles patch-main.c patch-motifutils.c
patchfiles patch-main.c patch-motifutils.c xmgr-string-h.diff \
configure.diff isfinite.diff
fetch.use_epsv no
master_sites ftp://plasma-gate.weizmann.ac.il/pub/xmgr4/src
checksums md5 2c6240bbd0c287cf8419aea48d73a2a3 \
sha1 7e679de2d48ca0de8dcb0435910df3f3d7a2c2ac \
rmd160 5f8b08b5e2cea0ca4e2c8b9d7d590f7bdb93a4ee
checksums rmd160 5f8b08b5e2cea0ca4e2c8b9d7d590f7bdb93a4ee \
sha256 92651881d4f0ce0e0ab71dea217ae2a0eab2e256bf454dba7cf5f564f89ef40a \
size 881991
depends_lib port:openmotif
depends_build port:autoconf
depends_lib port:motif
configure.args --disable-f77 --disable-netcdf --host=mac \
--enable-acegr-home=${prefix}/share/xmgr
configure.args --disable-f77 --disable-netcdf \
--enable-acegr-home=${prefix}/share/xmgr \
--x-includes=${prefix}/include \
--x-libraries=${prefix}/lib
configure.cflags-append -std=c99
variant netcdf description {Build with netcdf file support} {
depends_lib-append port:netcdf
configure.args-delete --disable-netcdf
}
# The aux scripts are too old to know that aarch64-darwin is a thing.
pre-configure {
file copy -force ${prefix}/share/autoconf/build-aux/config.guess ${worksrcpath}/ac-tools/config.guess
file copy -force ${prefix}/share/autoconf/build-aux/config.sub ${worksrcpath}/ac-tools/config.sub
}
build.target
use_parallel_build yes
@@ -47,3 +57,5 @@ destroot {
file delete ${worksrcpath}/examples/Makefile
file copy ${worksrcpath}/examples ${destroot}${prefix}/share/xmgr/
}
livecheck.type none
+20
View File
@@ -0,0 +1,20 @@
--- configure 1998-05-13 11:39:40.000000000 -0400
+++ configure 2026-04-30 16:19:00.000000000 -0400
@@ -769,7 +769,7 @@
cat > conftest.$ac_ext <<EOF
#line 771 "configure"
#include "confdefs.h"
-main(){return(0);}
+int main(){return(0);}
EOF
if { (eval echo configure:775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
ac_cv_prog_cc_works=yes
@@ -1797,7 +1797,7 @@
}
}
}
-main() {
+int main() {
pid_t parent = getpid ();
pid_t child;
+42
View File
@@ -0,0 +1,42 @@
--- cephes/Make.common 1998-05-12 08:17:15.000000000 -0400
+++ cephes/Make.common 2026-05-01 21:01:53.000000000 -0400
@@ -9,7 +9,7 @@
jn.c jv.c k0.c k1.c kn.c log2.c mtherr.c ndtri.c pdtr.c polevl.c \
polyn.c psi.c revers.c rgamma.c round.c shichi.c sici.c \
spence.c stdtr.c struve.c unity.c yn.c zeta.c zetac.c \
- acosh.c asinh.c atanh.c ndtr.c isfinite.c cbrt.c
+ acosh.c asinh.c atanh.c ndtr.c cbrt.c
OBJS = airy$(O) beta$(O) chbevl$(O) chdtr$(O) const$(O) dawsn$(O) ellie$(O) \
ellik$(O) ellpe$(O) ellpk$(O) expn$(O) fac$(O) fdtr$(O) fresnl$(O) \
@@ -19,5 +19,5 @@
polevl$(O) polyn$(O) psi$(O) revers$(O) rgamma$(O) round$(O) \
shichi$(O) sici$(O) spence$(O) stdtr$(O) struve$(O) \
unity$(O) yn$(O) zeta$(O) zetac$(O) \
- acosh$(O) asinh$(O) atanh$(O) ndtr$(O) isfinite$(O) cbrt$(O)
+ acosh$(O) asinh$(O) atanh$(O) ndtr$(O) cbrt$(O)
--- cmath.h 1998-05-03 18:20:04.000000000 -0400
+++ cmath.h 2026-05-01 20:55:29.000000000 -0400
@@ -102,10 +102,3 @@
extern double jn ( int n, double x );
#endif
-#ifndef HAVE_FINITE
-# define finite isfinite
-# ifndef HAVE_ISFINITE
-extern int isfinite ( double x );
-# endif
-#endif
-
--- src/fit.c 1997-11-14 17:13:35.000000000 -0500
+++ src/fit.c 2026-05-01 21:09:37.000000000 -0400
@@ -117,7 +117,7 @@
dofitcurve(n, x, y, ideg, result);
for (i = 0; i < n; i++) {
fitted[i] = leasev(result, ideg, x[i]);
- if (!finite(fitted[i])) {
+ if (!isfinite(fitted[i])) {
errmsg("Linear_regression - all values of x or y are the same");
ifail = 3;
return ifail;
+141
View File
@@ -0,0 +1,141 @@
--- src/chersh.c 1997-10-28 21:01:19.000000000 -0500
+++ src/chersh.c 2026-04-28 16:09:35.000000000 -0400
@@ -8,6 +8,7 @@
#include <cmath.h>
#include <stdio.h>
+#include <string.h>
#include <ctype.h>
#include "hersh.h" /* character defs */
#include "protos.h"
--- src/defaults.c 1997-11-29 20:09:07.000000000 -0500
+++ src/defaults.c 2026-04-28 16:07:37.000000000 -0400
@@ -10,11 +10,9 @@
#include <stdio.h>
#include <stdlib.h>
-#include "globals.h"
-#ifdef VMS
-# include <string.h>
-#endif
+#include <string.h>
+#include "globals.h"
#include "protos.h"
static defaults d_d =
--- src/draw.c 1997-11-22 16:37:24.000000000 -0500
+++ src/draw.c 2026-04-28 16:08:12.000000000 -0400
@@ -8,6 +8,8 @@
#include <cmath.h>
#include <stdio.h>
+#include <string.h>
+
#include "symdefs.h"
#include "draw.h"
#include "externs.h"
--- src/graphu1.c 2026-05-10 12:47:29.000000000 -0400
+++ src/graphu1.c 2026-04-28 16:06:28.000000000 -0400
@@ -8,6 +8,7 @@
#include <cmath.h>
#include <stdio.h>
+#include <string.h>
#include "globals.h"
#include "draw.h"
--- src/hp.c 1997-10-28 21:09:42.000000000 -0500
+++ src/hp.c 2026-04-28 16:09:15.000000000 -0400
@@ -13,6 +13,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <unistd.h>
#include "externs.h"
--- src/mif.c 1997-11-01 14:41:26.000000000 -0500
+++ src/mif.c 2026-04-28 16:08:56.000000000 -0400
@@ -27,6 +27,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <unistd.h>
#include <ctype.h>
--- src/nonlfit.c 1997-10-05 11:04:08.000000000 -0400
+++ src/nonlfit.c 2026-04-28 16:06:07.000000000 -0400
@@ -5,6 +5,7 @@
*/
#include <config.h>
+#include <string.h>
#include "globals.h"
#include "protos.h"
--- src/objutils.c 1997-11-23 13:12:22.000000000 -0400
+++ src/objutils.c 2026-04-28 16:07:21.000000000 -0400
@@ -9,6 +9,8 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
+
#include "globals.h"
#include "protos.h"
--- src/params.c 1998-05-13 12:33:33.000000000 -0400
+++ src/params.c 2026-04-28 16:07:51.000000000 -0400
@@ -8,6 +8,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
--- src/plotone.c 1997-11-29 14:33:19.000000000 -0500
+++ src/plotone.c 2026-04-28 16:05:40.000000000 -0400
@@ -9,6 +9,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
/*
* #include <setjmp.h>
*/
--- src/ps.c 1998-05-11 09:49:02.000000000 -0400
+++ src/ps.c 2026-04-28 16:08:31.000000000 -0400
@@ -25,6 +25,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <unistd.h>
#include <ctype.h>
--- src/regionutils.c 1997-11-21 15:04:32.000000000 -0500
+++ src/regionutils.c 2026-04-28 16:07:08.000000000 -0400
@@ -9,6 +9,8 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
+
#include "globals.h"
#include "draw.h"
#include "protos.h"
--- src/setutils.c 1997-11-29 20:15:49.000000000 -0500
+++ src/setutils.c 2026-04-28 16:06:49.000000000 -0400
@@ -10,6 +10,8 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
+
#include "globals.h"
#include "protos.h"