- Update to 2007.06.15.1339

- Unbreak

PR:		113887
Submitted by:	Jason Bacon <bacon@smithers.neuro.mcw.edu> (maintainer)

8 files changed, 121 insertions, 29 deletions

diff --git a/science/afni/Makefile b/science/afni/Makefile
index c47a14326948..714e29e3b04b 100644
--- a/science/afni/Makefile
+++ b/science/afni/Makefile
@@ -16,8 +16,7 @@
 # Makefile.BSD, which is included in the source distribution.
 
 PORTNAME=	afni
-PORTVERSION=	2007.04.18.1830
-PORTREVISION=	1
+PORTVERSION=	2007.06.15.1339
 CATEGORIES=	science biology graphics
 MASTER_SITES=	http://www.neuro.mcw.edu/~bacon/Ports/distfiles/AFNI/${PORTVERSION}/ \
 		http://afni.nimh.nih.gov/pub/dist/tgz/
@@ -35,15 +34,13 @@ RUN_DEPENDS=	cjpeg:${PORTSDIR}/graphics/jpeg \
 		ppmtogif:${PORTSDIR}/graphics/netpbm \
 		endian:${PORTSDIR}/sysutils/endian
 
-BROKEN=		Does not compile
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "sparc64"
 BROKEN=	Does not compile on sparc64: "undefined reference to '_mcount'"
 .endif
 
-USE_GL=		glw
+USE_GL=		glw glu
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
@@ -80,6 +77,8 @@ post-extract:
 .for f in ${X11R6_FILES}
 	@${REINPLACE_CMD} -e 's|/usr/X11R6|$${X11BASE}|g' ${WRKSRC}/${f}
 .endfor
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/afni.1 ${WRKDIR}
+	@${REINPLACE_CMD} "s|%%PREFIX%%|${PREFIX}|g" ${WRKDIR}/afni.1
 
 post-build:
 	${MKDIR} ${STAGE}/bin \
@@ -90,10 +89,6 @@ post-build:
 		${STAGE}/doc \
 		${STAGE}/share
 	${MV}	${INSTALL_WRKSRC}/libf2c.a \
-		${INSTALL_WRKSRC}/cjpeg \
-		${INSTALL_WRKSRC}/djpeg \
-		${INSTALL_WRKSRC}/mpeg_encode \
-		${INSTALL_WRKSRC}/whirlgif \
 		${STAGE}/trash
 	${MV}	${INSTALL_WRKSRC}/*.a \
 		${INSTALL_WRKSRC}/*.so \
@@ -106,6 +101,7 @@ post-build:
 		${STAGE}/include
 	${MV}	${INSTALL_WRKSRC}/README* \
 		${STAGE}/doc
+	${MV}	${INSTALL_WRKSRC}/abut ${INSTALL_WRKSRC}/afni_abut
 	for binary in `${FILE} ${INSTALL_WRKSRC}/* | fgrep 'ELF' | ${AWK} -F ':' ' { print $$1 }'` ; do \
 		${MV} $${binary} ${STAGE}/bin ; \
 	done
@@ -121,7 +117,7 @@ do-install:
 	${INSTALL_SCRIPT} ${STAGE}/scripts/* ${PREFIX}/bin
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/TTatlas* ${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/CA_EZ_v1.3c-May0806/* ${DATADIR}
-	${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/afni.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKDIR}/afni.1 ${PREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${STAGE}/doc/* ${DOCSDIR}
diff --git a/science/afni/distinfo b/science/afni/distinfo
index 77a4ab0d17b2..0c7cb92af4e0 100644
--- a/science/afni/distinfo
+++ b/science/afni/distinfo
@@ -1,15 +1,15 @@
-MD5 (AFNI-2007.04.18.1830/afni_src.tgz) = 90ecae8727cadc6172517bc7149be67e
-SHA256 (AFNI-2007.04.18.1830/afni_src.tgz) = 53796de972179f122ab7c557bf29d3511ed113119d04707e16b0766763f49c21
-SIZE (AFNI-2007.04.18.1830/afni_src.tgz) = 11283995
-MD5 (AFNI-2007.04.18.1830/afni.1) = 80cc1f1c6ca0ef59a3032ad63abfbdd5
-SHA256 (AFNI-2007.04.18.1830/afni.1) = 647815326aa676d005fa15de116a6f046b486530aa50a3100d8b29c11da8aaf7
-SIZE (AFNI-2007.04.18.1830/afni.1) = 1702
-MD5 (AFNI-2007.04.18.1830/TTatlas+tlrc.BRIK.gz) = f5a107b049bc426af5342565f4e5beee
-SHA256 (AFNI-2007.04.18.1830/TTatlas+tlrc.BRIK.gz) = 0b5b087006e07e05c5f0c8306acaade955924f744457cec0c00844cc2e9e67cd
-SIZE (AFNI-2007.04.18.1830/TTatlas+tlrc.BRIK.gz) = 159912
-MD5 (AFNI-2007.04.18.1830/TTatlas+tlrc.HEAD) = a0ca787a2996d7e66548176808503ac5
-SHA256 (AFNI-2007.04.18.1830/TTatlas+tlrc.HEAD) = 51c3fb158990616f355fea56886fc7c85d80ac96779f5a65a8f69207c2a85919
-SIZE (AFNI-2007.04.18.1830/TTatlas+tlrc.HEAD) = 1750
-MD5 (AFNI-2007.04.18.1830/CA_EZ_v1.3c-May0806.tgz) = dbb2caab5c030c505b306e1526d19150
-SHA256 (AFNI-2007.04.18.1830/CA_EZ_v1.3c-May0806.tgz) = b4e9a6bbb2324c01f70d50e911793e637373040c8cca8e5f17882a146396bc31
-SIZE (AFNI-2007.04.18.1830/CA_EZ_v1.3c-May0806.tgz) = 2652278
+MD5 (AFNI-2007.06.15.1339/afni_src.tgz) = 19f4c9e5dac9459b14c40475879f1dda
+SHA256 (AFNI-2007.06.15.1339/afni_src.tgz) = b4778ada0afb603f4a104ee2448792d5f3b0eea844defda8dd9141002c98a433
+SIZE (AFNI-2007.06.15.1339/afni_src.tgz) = 11331933
+MD5 (AFNI-2007.06.15.1339/afni.1) = 02708ca46c60d6774af4796535e263ed
+SHA256 (AFNI-2007.06.15.1339/afni.1) = f134d1f869b1dfd618c61e58fd24b9c4dcfea9c25bc5b1c26dbbb141719cd6f8
+SIZE (AFNI-2007.06.15.1339/afni.1) = 1667
+MD5 (AFNI-2007.06.15.1339/TTatlas+tlrc.BRIK.gz) = f5a107b049bc426af5342565f4e5beee
+SHA256 (AFNI-2007.06.15.1339/TTatlas+tlrc.BRIK.gz) = 0b5b087006e07e05c5f0c8306acaade955924f744457cec0c00844cc2e9e67cd
+SIZE (AFNI-2007.06.15.1339/TTatlas+tlrc.BRIK.gz) = 159912
+MD5 (AFNI-2007.06.15.1339/TTatlas+tlrc.HEAD) = a0ca787a2996d7e66548176808503ac5
+SHA256 (AFNI-2007.06.15.1339/TTatlas+tlrc.HEAD) = 51c3fb158990616f355fea56886fc7c85d80ac96779f5a65a8f69207c2a85919
+SIZE (AFNI-2007.06.15.1339/TTatlas+tlrc.HEAD) = 1750
+MD5 (AFNI-2007.06.15.1339/CA_EZ_v1.3c-May0806.tgz) = dbb2caab5c030c505b306e1526d19150
+SHA256 (AFNI-2007.06.15.1339/CA_EZ_v1.3c-May0806.tgz) = b4e9a6bbb2324c01f70d50e911793e637373040c8cca8e5f17882a146396bc31
+SIZE (AFNI-2007.06.15.1339/CA_EZ_v1.3c-May0806.tgz) = 2652278
diff --git a/science/afni/files/Makefile.FreeBSD_PORT b/science/afni/files/Makefile.FreeBSD_PORT
index a2912343936a..fbd29dd9a198 100644
--- a/science/afni/files/Makefile.FreeBSD_PORT
+++ b/science/afni/files/Makefile.FreeBSD_PORT
@@ -45,7 +45,7 @@ CC?     = cc
 LD?     = ${CC}
 
 CCDEBS = -DAFNI_DEBUG -DIMSEQ_DEBUG -DDISPLAY_DEBUG -DTHD_DEBUG
-CEXTRA = -DFreeBSD -DNO_GAMMA -DUSE_TRACING -DHAVE_XDBE
+CEXTRA = -DFreeBSD -DNO_GAMMA -DUSE_TRACING -DHAVE_XDBE -DSUMA_MOTIF_GLXAREA
 ifeq (${ARCH}, amd64)
 CEXTRA += -DPIC -fPIC
 endif
diff --git a/science/afni/files/patch-Makefile.INCLUDE b/science/afni/files/patch-Makefile.INCLUDE
new file mode 100644
index 000000000000..ffee4af8ec14
--- /dev/null
+++ b/science/afni/files/patch-Makefile.INCLUDE
@@ -0,0 +1,11 @@
+--- Makefile.INCLUDE.orig	Fri Apr 27 15:03:08 2007
++++ Makefile.INCLUDE	Fri Apr 27 15:03:29 2007
+@@ -41,7 +41,7 @@
+ ## AFNI package, but included because they are useful.  Some of
+ ## them are Open Source programs, not from the AFNI group at all.
+ 
+-EXTRAS   = cjpeg djpeg whirlgif mpeg_encode myget Xphace rmz aiv $(EXPROGS)
++EXTRAS   = myget Xphace rmz aiv $(EXPROGS)
+ 
+ # mpegtoppm in above list
+ 
diff --git a/science/afni/files/patch-SUMA-SUMA_display.c b/science/afni/files/patch-SUMA-SUMA_display.c
new file mode 100644
index 000000000000..7110191f4ccd
--- /dev/null
+++ b/science/afni/files/patch-SUMA-SUMA_display.c
@@ -0,0 +1,53 @@
+--- SUMA/SUMA_display.c.orig	Wed Jun  6 12:42:06 2007
++++ SUMA/SUMA_display.c	Wed Jun  6 12:45:54 2007
+@@ -1854,22 +1854,14 @@
+          
+  
+          
+-      #ifdef SUMA_MOTIF_GLXAREA
+-        /* Step 4. */
+-        SUMAg_SVv[ic].X->FORM = XmCreateForm(SUMAg_SVv[ic].X->TOPLEVEL, "form", NULL, 0);
+-        XtManageChild(SUMAg_SVv[ic].X->FORM);
+-        SUMAg_SVv[ic].X->FRAME = XmCreateFrame(SUMAg_SVv[ic].X->FORM, "frame", NULL, 0);
+-        XtVaSetValues(SUMAg_SVv[ic].X->FRAME,
+-          XmNbottomAttachment, XmATTACH_FORM,
+-          XmNtopAttachment, XmATTACH_FORM,
+-          XmNleftAttachment, XmATTACH_FORM,
+-          XmNrightAttachment, XmATTACH_FORM,
+-          NULL);
+-        XtManageChild(SUMAg_SVv[ic].X->FRAME);
+-
+-        /* Step 5. */
+         SUMAg_SVv[ic].X->CMAP = SUMA_getShareableColormap(&(SUMAg_SVv[ic]));
+ 
++        /* create a frame to put glxarea in */
++        SUMAg_SVv[ic].X->FRAME = XmCreateFrame (mainw, "frame", NULL, 0);
++        XtManageChild(SUMAg_SVv[ic].X->FRAME);
++
++      #ifdef SUMA_MOTIF_GLXAREA
++        SUMA_LH("MOTIF Drawing Area");
+         /* Step 6. */
+          /* glwMDrawingAreaWidgetClass requires libMesaGLwM.a */
+          SUMAg_SVv[ic].X->GLXAREA = XtVaCreateManagedWidget("glxarea",
+@@ -1878,20 +1870,13 @@
+           XtNcolormap, SUMAg_SVv[ic].X->CMAP,
+           NULL);
+       #else
+-      /* Step 4-6. */
+-         SUMAg_SVv[ic].X->CMAP = SUMA_getShareableColormap(&(SUMAg_SVv[ic]));
+-
+-         /* create a frame to put glxarea in */
+-         SUMAg_SVv[ic].X->FRAME  = XmCreateFrame (mainw, "frame", NULL, 0);
+-         XtManageChild(SUMAg_SVv[ic].X->FRAME);
+-
++        SUMA_LH("GL Drawing Area");
+          /* glwDrawingAreaWidgetClass requires libMesaGLw.a */
+          SUMAg_SVv[ic].X->GLXAREA = XtVaCreateManagedWidget("glxarea",
+           glwDrawingAreaWidgetClass, SUMAg_SVv[ic].X->FRAME,
+           GLwNvisualInfo, SUMAg_SVv[ic].X->VISINFO,
+           XtNcolormap, SUMAg_SVv[ic].X->CMAP,
+           NULL);
+-      
+       #endif
+ 
+           
diff --git a/science/afni/files/patch-SUMA-SUMA_xColBar.c b/science/afni/files/patch-SUMA-SUMA_xColBar.c
new file mode 100644
index 000000000000..d17110405e47
--- /dev/null
+++ b/science/afni/files/patch-SUMA-SUMA_xColBar.c
@@ -0,0 +1,26 @@
+--- SUMA/SUMA_xColBar.c.orig	Wed Jun  6 12:42:16 2007
++++ SUMA/SUMA_xColBar.c	Wed Jun  6 12:43:42 2007
+@@ -4087,6 +4087,15 @@
+          NULL);
+       
+       /* open me a glxarea */
++      #ifdef SUMA_MOTIF_GLXAREA
++         SO->SurfCont->cmp_ren->cmap_wid = XtVaCreateManagedWidget("glxarea",
++             glwMDrawingAreaWidgetClass, rcc2,
++             GLwNvisualInfo, SUMAg_SVv[0].X->VISINFO,
++             XtNcolormap, SUMAg_SVv[0].X->CMAP,
++             XmNwidth,   SUMA_CMAP_WIDTH,
++             XmNheight,  SUMA_CMAP_HEIGHT,
++             NULL);
++      #else
+       SO->SurfCont->cmp_ren->cmap_wid = XtVaCreateManagedWidget("glxarea",
+                                           glwDrawingAreaWidgetClass, rcc2,
+                                           GLwNvisualInfo, SUMAg_SVv[0].X->VISINFO,
+@@ -4094,6 +4103,7 @@
+                                           XmNwidth,   SUMA_CMAP_WIDTH,
+                                           XmNheight,  SUMA_CMAP_HEIGHT,
+                                           NULL);
++      #endif
+ 
+       XtManageChild (rcc2);
+       
diff --git a/science/afni/pkg-message b/science/afni/pkg-message
index 4b41315202d8..ad5ad6a4b4e5 100644
--- a/science/afni/pkg-message
+++ b/science/afni/pkg-message
@@ -13,5 +13,8 @@ http://afni.nimh.nih.gov.
 For large 3dDeconvolve analyses, you may need to increase the shared
 memory limit on your system.  For instructions, visit
 
-http://www.neuro.mcw.edu/~bacon/FreeBSD_MRI/
+http://www.neuro.mcw.edu/~bacon/Ports/FreeBSD/shared_mem.html
+
+The program "abut" has been renamed "afni_abut" to resolve a collision
+with the unixstat port.
 =============================================================================
diff --git a/science/afni/pkg-plist b/science/afni/pkg-plist
index 4ea9ad76f60f..52fbcf54c17c 100644
--- a/science/afni/pkg-plist
+++ b/science/afni/pkg-plist
@@ -69,6 +69,7 @@ bin/3dMedianFilter
 bin/3dNLfim
 bin/3dNotes
 bin/3dOverlap
+bin/3dPAR2AFNI.pl
 bin/3dROIstats
 bin/3dRegAna
 bin/3dRowFillin
@@ -209,9 +210,9 @@ bin/SurfToSurf
 bin/SurfaceMetrics
 bin/Vecwarp
 bin/Xphace
-bin/abut
 bin/adwarp
 bin/afni
+bin/afni_abut
 bin/afni_base.py
 bin/afni_proc.py
 bin/afni_util.py
@@ -281,7 +282,6 @@ bin/whereami
 include/afni/3ddata.h
 include/afni/afni_environ.h
 include/afni/afni_warp.h
-include/afni/cdflib.h
 include/afni/coxplot.h
 include/afni/cs.h
 include/afni/cs_sort_template.h
@@ -406,6 +406,7 @@ lib/afni/plug_zeropad.so
 %%DATADIR%%/face_asanders.jpg
 %%DATADIR%%/face_ashackman.jpg
 %%DATADIR%%/face_athomas.jpg
+%%DATADIR%%/face_aysesaygin.jpg
 %%DATADIR%%/face_bandettini.jpg
 %%DATADIR%%/face_barbaracd.jpg
 %%DATADIR%%/face_bargall.jpg
@@ -422,6 +423,7 @@ lib/afni/plug_zeropad.so
 %%DATADIR%%/face_claudio.jpg
 %%DATADIR%%/face_cmoritz.jpg
 %%DATADIR%%/face_cmyers.jpg
+%%DATADIR%%/face_craigstark.jpg
 %%DATADIR%%/face_cscholl.jpg
 %%DATADIR%%/face_csenior.jpg
 %%DATADIR%%/face_cwettig.jpg
@@ -469,6 +471,7 @@ lib/afni/plug_zeropad.so
 %%DATADIR%%/face_lincoln1.jpg
 %%DATADIR%%/face_lincoln2.jpg
 %%DATADIR%%/face_lindachao.jpg
+%%DATADIR%%/face_lindathede.jpg
 %%DATADIR%%/face_lisaeyler.jpg
 %%DATADIR%%/face_lizyoder.jpg
 %%DATADIR%%/face_ljcox.jpg