diff options
| author | jwb <jwb@FreeBSD.org> | 2019-06-19 03:00:55 +0800 |
|---|---|---|
| committer | jwb <jwb@FreeBSD.org> | 2019-06-19 03:00:55 +0800 |
| commit | 794f931cb56f5ba971b0d5ed3d76c3e901c82512 (patch) | |
| tree | 9247cac104ca786a1401984307a3d7e9e9f05713 /science | |
| parent | 23b66e4a04a35b1b590bb5138b3a3838b1650bcf (diff) | |
| download | freebsd-ports-gnome-794f931cb56f5ba971b0d5ed3d76c3e901c82512.tar.gz freebsd-ports-gnome-794f931cb56f5ba971b0d5ed3d76c3e901c82512.tar.zst freebsd-ports-gnome-794f931cb56f5ba971b0d5ed3d76c3e901c82512.zip | |
science/afni: Upgrade to 19.1.20
Upstreamed FreeBSD patches, other minor fixes and enhancements
Reported by: portscout, Rick Reynolds (NIH)
Diffstat (limited to 'science')
| -rw-r--r-- | science/afni/Makefile | 2 | ||||
| -rw-r--r-- | science/afni/distinfo | 6 | ||||
| -rw-r--r-- | science/afni/files/patch-nifti_cifti_afni__xml.h | 10 | ||||
| -rw-r--r-- | science/afni/files/patch-prf__common__circular.c | 18 | ||||
| -rw-r--r-- | science/afni/files/patch-ptaylor_Makefile.ptaylor.INCLUDE | 16 |
5 files changed, 4 insertions, 48 deletions
diff --git a/science/afni/Makefile b/science/afni/Makefile index c0557b865781..f31ca98151b0 100644 --- a/science/afni/Makefile +++ b/science/afni/Makefile @@ -2,7 +2,7 @@ PORTNAME= afni DISTVERSIONPREFIX= AFNI_ -DISTVERSION= 19.1.18 +DISTVERSION= 19.1.20 CATEGORIES= science biology graphics perl5 python MAINTAINER= jwb@FreeBSD.org diff --git a/science/afni/distinfo b/science/afni/distinfo index 79208c4503cd..50b6d9de6588 100644 --- a/science/afni/distinfo +++ b/science/afni/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1559998284 -SHA256 (afni-afni-AFNI_19.1.18_GH0.tar.gz) = 73be9fa066ba3da3f035c9935612c6f4254257be4f8b99df29437cdd0ca31b07 -SIZE (afni-afni-AFNI_19.1.18_GH0.tar.gz) = 38927911 +TIMESTAMP = 1560861068 +SHA256 (afni-afni-AFNI_19.1.20_GH0.tar.gz) = d9d63e3c8f4d38b28c4ceb71ee5537e66f400a6f2b2e0443fa58f2cf7a112007 +SIZE (afni-afni-AFNI_19.1.20_GH0.tar.gz) = 38939294 diff --git a/science/afni/files/patch-nifti_cifti_afni__xml.h b/science/afni/files/patch-nifti_cifti_afni__xml.h deleted file mode 100644 index a71c92562531..000000000000 --- a/science/afni/files/patch-nifti_cifti_afni__xml.h +++ /dev/null @@ -1,10 +0,0 @@ ---- nifti/cifti/afni_xml.h.orig 2015-11-06 21:25:14 UTC -+++ nifti/cifti/afni_xml.h -@@ -5,6 +5,7 @@ - #define AXML_MAX_ELEN 128 /* maximum element length */ - - #include <stdio.h> -+#include <inttypes.h> - - /* ---------------------------------------------------------------------- - This code is for generic reading of xml into structures. diff --git a/science/afni/files/patch-prf__common__circular.c b/science/afni/files/patch-prf__common__circular.c deleted file mode 100644 index cfcaf2d3f01d..000000000000 --- a/science/afni/files/patch-prf__common__circular.c +++ /dev/null @@ -1,18 +0,0 @@ ---- prf_common_circular.c.orig 2019-05-10 21:23:56 UTC -+++ prf_common_circular.c -@@ -318,8 +318,14 @@ static int show_malloc_stats(char * mesg) - - if( show_stats ) { - fprintf(stderr,"\n----- malloc stats: %s\n", mesg); --#ifndef DARWIN -+#if defined(__linux__) - malloc_stats(); -+#elif defined(__FreeBSD__) -+ #include <stdlib.h> -+ #include <malloc_np.h> -+ malloc_stats_print(NULL, NULL, "g"); -+#else -+ fprintf(stderr, "No malloc_stats() on this platform.\n"); - #endif - } - diff --git a/science/afni/files/patch-ptaylor_Makefile.ptaylor.INCLUDE b/science/afni/files/patch-ptaylor_Makefile.ptaylor.INCLUDE deleted file mode 100644 index b3374412c7e3..000000000000 --- a/science/afni/files/patch-ptaylor_Makefile.ptaylor.INCLUDE +++ /dev/null @@ -1,16 +0,0 @@ ---- ptaylor/Makefile.ptaylor.INCLUDE.orig 2019-05-21 17:27:32 UTC -+++ ptaylor/Makefile.ptaylor.INCLUDE -@@ -228,11 +228,11 @@ map_TrackID:map_TrackID.o ${AFNI_3dOBJS} ${PTAYLORLIB} - - 3dDWUncert.o: 3dDWUncert.c - $(RM) $@ -- $(CCOMP_PT) -c 3dDWUncert.c $(PTAYLOR_INCLUDE_PATH) -+ $(CCOMP_PT) -c -fopenmp 3dDWUncert.c $(PTAYLOR_INCLUDE_PATH) - - 3dDWUncert:3dDWUncert.o ${AFNI_3dOBJS} ${PTAYLORLIB} - $(RM) $@ -- $(CCOMP_PT) -o 3dDWUncert 3dDWUncert.o ${AFNI_3dOBJS} \ -+ $(CCOMP_PT) -fopenmp -o 3dDWUncert 3dDWUncert.o ${AFNI_3dOBJS} \ - ${PTAYLOR_INCLUDE_PATH} ${PTAYLOR_LINK_PATH} \ - $(LFLAGS) ${PTAYLORLIB} $(LLIBS) \ - -lgsl -lgslcblas -lm |