3 files changed, 56 insertions, 30 deletions

diff --git a/science/afni/Makefile b/science/afni/Makefile
index 9528da92edaa..f566659ae840 100644
--- a/science/afni/Makefile
+++ b/science/afni/Makefile
@@ -16,27 +16,29 @@
 # Makefile.BSD, which is included in the source distribution.
 
 PORTNAME=	afni
-PORTVERSION=	2005.12.30.0934.2
+PORTVERSION=	2006.03.21.1314
 CATEGORIES=	science biology graphics
-MASTER_SITES=	http://www.neuro.mcw.edu/~bacon/Ports/distfiles/AFNI/${PORTVERSION}/
-DISTFILES=	afni_src.tgz afni_doc.tgz afni.1 \
-		Makefile.FreeBSD_PORT TTatlas+tlrc.BRIK.gz TTatlas+tlrc.HEAD
+MASTER_SITES=	http://afni.nimh.nih.gov/pub/dist/tgz/ \
+		http://www.neuro.mcw.edu/~bacon/Ports/distfiles/AFNI/${PORTVERSION}/
+DISTFILES=	afni_src.tgz afni_doc.tgz afni.1 Makefile.FreeBSD_PORT \
+		TTatlas+tlrc.BRIK.gz TTatlas+tlrc.HEAD CA_EZ_v1.3b-Mar1506.tgz
 DIST_SUBDIR=	AFNI-${PORTVERSION}
-EXTRACT_ONLY=	afni_src.tgz afni_doc.tgz
+EXTRACT_ONLY=	afni_src.tgz afni_doc.tgz CA_EZ_v1.3b-Mar1506.tgz
 
 MAINTAINER=	bacon@smithers.neuro.mcw.edu
 COMMENT=	Advanced Functional Neuro Imaging
 
+RUN_DEPENDS=	cjpeg:${PORTSDIR}/graphics/jpeg \
+		mpeg_encode:${PORTSDIR}/multimedia/mpeg_encode \
+		whirlgif:${PORTSDIR}/graphics/whirlgif \
+		ppmtogif:${PORTSDIR}/graphics/netpbm
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "sparc64"
 BROKEN=	Does not compile on sparc64: "undefined reference to `_mcount'"
 .endif
 
-RUN_DEPENDS=	cjpeg:${PORTSDIR}/graphics/jpeg \
-		mpeg_encode:${PORTSDIR}/multimedia/mpeg_encode \
-		whirlgif:${PORTSDIR}/graphics/whirlgif
-
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
@@ -85,9 +87,11 @@ SCRIPTS=\
 	@clip_volume \
 	@fix_FSsphere \
 	@make_stim_file \
+	@np \
 	@parse_afni_name \
 	@parse_name \
-	suma_change_spec \
+	3dMax \
+	suma_change_spec
 
 PLIST_FILES+=	${SCRIPTS:S|^|bin/|}
 
@@ -122,6 +126,7 @@ do-install:
 .endfor
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/* ${PREFIX}/bin
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/TTatlas* ${DATADIR}
+	${INSTALL_DATA} ${WRKDIR}/CA_EZ_v1.3b-Mar1506/* ${DATADIR}
 	${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/afni.1 ${PREFIX}/man/man1
 	@${MV} ${INSTALL_TEMP}/* ${INSTALL_WRKSRC}
 .if !defined(NOPORTDOCS)
diff --git a/science/afni/distinfo b/science/afni/distinfo
index 75cd073b647a..807177e6d30a 100644
--- a/science/afni/distinfo
+++ b/science/afni/distinfo
@@ -1,18 +1,21 @@
-MD5 (AFNI-2005.12.30.0934.2/afni_src.tgz) = 3c711d3ba5295953f0e8acbb3062ab65
-SHA256 (AFNI-2005.12.30.0934.2/afni_src.tgz) = a7341ffa0f8725cd0c7bc3bd9ccb097d05ec5d56b60f92037a5f8a5e0d0e6316
-SIZE (AFNI-2005.12.30.0934.2/afni_src.tgz) = 10863304
-MD5 (AFNI-2005.12.30.0934.2/afni_doc.tgz) = 3b085de85fc46908652ae287d1cceb38
-SHA256 (AFNI-2005.12.30.0934.2/afni_doc.tgz) = 28bfcb085d97f63a7e6b753d784908d7f90d9d3ba735d96b18c1e893af4d6cd1
-SIZE (AFNI-2005.12.30.0934.2/afni_doc.tgz) = 3267095
-MD5 (AFNI-2005.12.30.0934.2/afni.1) = 39c9a1a39b207cd957f0f0d5ec220e4e
-SHA256 (AFNI-2005.12.30.0934.2/afni.1) = f14991934a8b78f2497cd1d0f48b849c1a6debef01c666eafd70993ba63c99da
-SIZE (AFNI-2005.12.30.0934.2/afni.1) = 1103
-MD5 (AFNI-2005.12.30.0934.2/Makefile.FreeBSD_PORT) = 77fd9306b8e5c73c555edcf04aeaf562
-SHA256 (AFNI-2005.12.30.0934.2/Makefile.FreeBSD_PORT) = f29118dbe49cc95de62a6b3ca2b31cfae0017247854d764dc5e0069ed58f589b
-SIZE (AFNI-2005.12.30.0934.2/Makefile.FreeBSD_PORT) = 3101
-MD5 (AFNI-2005.12.30.0934.2/TTatlas+tlrc.BRIK.gz) = f5a107b049bc426af5342565f4e5beee
-SHA256 (AFNI-2005.12.30.0934.2/TTatlas+tlrc.BRIK.gz) = 0b5b087006e07e05c5f0c8306acaade955924f744457cec0c00844cc2e9e67cd
-SIZE (AFNI-2005.12.30.0934.2/TTatlas+tlrc.BRIK.gz) = 159912
-MD5 (AFNI-2005.12.30.0934.2/TTatlas+tlrc.HEAD) = a0ca787a2996d7e66548176808503ac5
-SHA256 (AFNI-2005.12.30.0934.2/TTatlas+tlrc.HEAD) = 51c3fb158990616f355fea56886fc7c85d80ac96779f5a65a8f69207c2a85919
-SIZE (AFNI-2005.12.30.0934.2/TTatlas+tlrc.HEAD) = 1750
+MD5 (AFNI-2006.03.21.1314/afni_src.tgz) = 4b66b4951788c36b137d46dc3dcac4bb
+SHA256 (AFNI-2006.03.21.1314/afni_src.tgz) = 688140a767196086a6db522f1b88f2b8d19cf72648ef689a5f74dc4c3975b610
+SIZE (AFNI-2006.03.21.1314/afni_src.tgz) = 10856284
+MD5 (AFNI-2006.03.21.1314/afni_doc.tgz) = 3b085de85fc46908652ae287d1cceb38
+SHA256 (AFNI-2006.03.21.1314/afni_doc.tgz) = 28bfcb085d97f63a7e6b753d784908d7f90d9d3ba735d96b18c1e893af4d6cd1
+SIZE (AFNI-2006.03.21.1314/afni_doc.tgz) = 3267095
+MD5 (AFNI-2006.03.21.1314/afni.1) = 39c9a1a39b207cd957f0f0d5ec220e4e
+SHA256 (AFNI-2006.03.21.1314/afni.1) = f14991934a8b78f2497cd1d0f48b849c1a6debef01c666eafd70993ba63c99da
+SIZE (AFNI-2006.03.21.1314/afni.1) = 1103
+MD5 (AFNI-2006.03.21.1314/Makefile.FreeBSD_PORT) = 77fd9306b8e5c73c555edcf04aeaf562
+SHA256 (AFNI-2006.03.21.1314/Makefile.FreeBSD_PORT) = f29118dbe49cc95de62a6b3ca2b31cfae0017247854d764dc5e0069ed58f589b
+SIZE (AFNI-2006.03.21.1314/Makefile.FreeBSD_PORT) = 3101
+MD5 (AFNI-2006.03.21.1314/TTatlas+tlrc.BRIK.gz) = f5a107b049bc426af5342565f4e5beee
+SHA256 (AFNI-2006.03.21.1314/TTatlas+tlrc.BRIK.gz) = 0b5b087006e07e05c5f0c8306acaade955924f744457cec0c00844cc2e9e67cd
+SIZE (AFNI-2006.03.21.1314/TTatlas+tlrc.BRIK.gz) = 159912
+MD5 (AFNI-2006.03.21.1314/TTatlas+tlrc.HEAD) = a0ca787a2996d7e66548176808503ac5
+SHA256 (AFNI-2006.03.21.1314/TTatlas+tlrc.HEAD) = 51c3fb158990616f355fea56886fc7c85d80ac96779f5a65a8f69207c2a85919
+SIZE (AFNI-2006.03.21.1314/TTatlas+tlrc.HEAD) = 1750
+MD5 (AFNI-2006.03.21.1314/CA_EZ_v1.3b-Mar1506.tgz) = a66e4abb3385878a945351e761d12723
+SHA256 (AFNI-2006.03.21.1314/CA_EZ_v1.3b-Mar1506.tgz) = c9e884370a1580b1101c01f44cc76f81fc0fd64af7796b76762091ee9de4feed
+SIZE (AFNI-2006.03.21.1314/CA_EZ_v1.3b-Mar1506.tgz) = 2645818
diff --git a/science/afni/pkg-plist b/science/afni/pkg-plist
index bf872f418500..66a50306c100 100644
--- a/science/afni/pkg-plist
+++ b/science/afni/pkg-plist
@@ -3,6 +3,7 @@ bin/1ddot
 bin/1deval
 bin/1dfft
 bin/1dgrayplot
+bin/1dmatcalc
 bin/1dnorm
 bin/1dplot
 bin/1dsum
@@ -11,7 +12,6 @@ bin/1dtranspose
 bin/24swap
 bin/2dImReg
 bin/2swap
-bin/3T_toafni
 bin/3dAFNIto3D
 bin/3dAFNItoANALYZE
 bin/3dAFNItoMINC
@@ -29,6 +29,7 @@ bin/3dAutoTcorrelate
 bin/3dAutobox
 bin/3dAutomask
 bin/3dBRAIN_VOYAGERtoAFNI
+bin/3dBrickStat
 bin/3dCM
 bin/3dCRUISEtoAFNI
 bin/3dClipLevel
@@ -47,12 +48,12 @@ bin/3dFourier
 bin/3dFriedman
 bin/3dGetrow
 bin/3dIntracranial
+bin/3dInvFMRI
 bin/3dKruskalWallis
 bin/3dLRflip
 bin/3dLocalstat
 bin/3dMINCtoAFNI
 bin/3dMannWhitney
-bin/3dMax
 bin/3dMean
 bin/3dMedianFilter
 bin/3dNLfim
@@ -76,6 +77,7 @@ bin/3dTqual
 bin/3dTshift
 bin/3dTsmooth
 bin/3dTstat
+bin/3dTwotoComplex
 bin/3dUndump
 bin/3dUniformize
 bin/3dVol2Surf
@@ -106,6 +108,7 @@ bin/3dhistog
 bin/3dinfo
 bin/3dmaskave
 bin/3dmaskdump
+bin/3dmatcalc
 bin/3dmaxima
 bin/3dmerge
 bin/3dnewid
@@ -309,6 +312,18 @@ lib/plug_vol2surf.so
 lib/plug_volreg.so
 lib/plug_wavelets.so
 lib/plug_zeropad.so
+%%DATADIR%%/Dist_Stamp
+%%DATADIR%%/Readme_dist
+%%DATADIR%%/TT_N27+tlrc.BRIK.gz
+%%DATADIR%%/TT_N27+tlrc.HEAD
+%%DATADIR%%/TT_N27_CA_EZ_MPM+tlrc.BRIK.gz
+%%DATADIR%%/TT_N27_CA_EZ_MPM+tlrc.HEAD
+%%DATADIR%%/TT_N27_CA_EZ_PMaps+tlrc.BRIK.gz
+%%DATADIR%%/TT_N27_CA_EZ_PMaps+tlrc.HEAD
+%%DATADIR%%/TT_N27_EZ_LR+tlrc.BRIK.gz
+%%DATADIR%%/TT_N27_EZ_LR+tlrc.HEAD
+%%DATADIR%%/TT_N27_EZ_ML+tlrc.BRIK.gz
+%%DATADIR%%/TT_N27_EZ_ML+tlrc.HEAD
 %%DATADIR%%/TTatlas+tlrc.BRIK.gz
 %%DATADIR%%/TTatlas+tlrc.HEAD
 %%DATADIR%%/face_JimEliassen.jpg
@@ -341,6 +356,7 @@ lib/plug_zeropad.so
 %%DATADIR%%/face_claudio.jpg
 %%DATADIR%%/face_cmoritz.jpg
 %%DATADIR%%/face_cmyers.jpg
+%%DATADIR%%/face_cscholl.jpg
 %%DATADIR%%/face_csenior.jpg
 %%DATADIR%%/face_cwettig.jpg
 %%DATADIR%%/face_dglen.jpg
@@ -376,11 +392,13 @@ lib/plug_zeropad.so
 %%DATADIR%%/face_kropella.jpg
 %%DATADIR%%/face_kschreiber.jpg
 %%DATADIR%%/face_kuba.jpg
+%%DATADIR%%/face_kylesimmons.jpg
 %%DATADIR%%/face_lask.jpg
 %%DATADIR%%/face_laura.jpg
 %%DATADIR%%/face_lincoln1.jpg
 %%DATADIR%%/face_lincoln2.jpg
 %%DATADIR%%/face_lindachao.jpg
+%%DATADIR%%/face_lisaeyler.jpg
 %%DATADIR%%/face_lizyoder.jpg
 %%DATADIR%%/face_ljcox.jpg
 %%DATADIR%%/face_llatour.jpg