Attachment #79267 for bug #113887

View | Details | Raw Unified | Return to bug 113887
Collapse All | Expand All




############################################################################
# Ports collection Makefile for:   afni
# Date created:        11 Jan 2005
# Whom:                Jason W. Bacon <bacon@smithers.neuro.mcw.edu>
#
# $FreeBSD$
#

############################################################################

# Makefile.BSD, which is included in the source distribution.

PORTNAME=	afni
PORTVERSION=	2007.06.15.1339
PORTREVISION=	1
CATEGORIES=	science biology graphics
MASTER_SITES=	http://www.neuro.mcw.edu/~bacon/Ports/distfiles/AFNI/${PORTVERSION}/ \
		http://afni.nimh.nih.gov/pub/dist/tgz/

		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 glu
USE_GETTEXT=	yes
USE_GMAKE=	yes
USE_ICONV=	yes

.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 \

		${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 \

		${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

	${INSTALL_SCRIPT} ${STAGE}/scripts/* ${PREFIX}/bin
	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/TTatlas* ${DATADIR}
	${INSTALL_DATA} ${WRKDIR}/CA_EZ_v1.3c-May0806/* ${DATADIR}
	${INSTALL_MAN} ${WRKDIR}/afni.1 ${PREFIX}/man/man1
.if !defined(NOPORTDOCS)
	${MKDIR} ${DOCSDIR}
	${INSTALL_DATA} ${STAGE}/doc/* ${DOCSDIR}




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

Lines 45-51 Link Here

(-)afni/files/Makefile.FreeBSD_PORT (-1 / +1 lines)
45	LD? = ${CC}	45	LD? = ${CC}
46		46
47	CCDEBS = -DAFNI_DEBUG -DIMSEQ_DEBUG -DDISPLAY_DEBUG -DTHD_DEBUG	47	CCDEBS = -DAFNI_DEBUG -DIMSEQ_DEBUG -DDISPLAY_DEBUG -DTHD_DEBUG
48	CEXTRA = -DFreeBSD -DNO_GAMMA -DUSE_TRACING -DHAVE_XDBE	48	CEXTRA = -DFreeBSD -DNO_GAMMA -DUSE_TRACING -DHAVE_XDBE -DSUMA_MOTIF_GLXAREA
49	ifeq (${ARCH}, amd64)	49	ifeq (${ARCH}, amd64)
50	CEXTRA += -DPIC -fPIC	50	CEXTRA += -DPIC -fPIC
51	endif	51	endif

Line 0 Link Here

(-)afni/files/patch-Makefile.INCLUDE (+11 lines)
	1	--- Makefile.INCLUDE.orig Fri Apr 27 15:03:08 2007
	2	+++ Makefile.INCLUDE Fri Apr 27 15:03:29 2007
	3	@@ -41,7 +41,7 @@
	4	## AFNI package, but included because they are useful. Some of
	5	## them are Open Source programs, not from the AFNI group at all.
	6
	7	-EXTRAS = cjpeg djpeg whirlgif mpeg_encode myget Xphace rmz aiv $(EXPROGS)
	8	+EXTRAS = myget Xphace rmz aiv $(EXPROGS)
	9
	10	# mpegtoppm in above list
	11




--- 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
 
           




--- 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);
       

Lines 2-7 Link Here

(-)afni/pkg-descr (-1 / +1 lines)
2	a tool for analyzing 3 dimensional images, especially functional MRI	2	a tool for analyzing 3 dimensional images, especially functional MRI
3	images used in brain mapping research.	3	images used in brain mapping research.
4		4
5	WWW: http://afni.nimh.nih.gov/	5	WWW: http://www.neuro.mcw.edu/~bacon/Ports
6		6
7	-- Jason W. Bacon <bacon@smithers.neuro.mcw.edu>	7	-- Jason W. Bacon <bacon@smithers.neuro.mcw.edu>

Lines 13-17 Link Here

(-)afni/pkg-message (-1 / +4 lines)
13	For large 3dDeconvolve analyses, you may need to increase the shared	13	For large 3dDeconvolve analyses, you may need to increase the shared
14	memory limit on your system. For instructions, visit	14	memory limit on your system. For instructions, visit
15		15
16	http://www.neuro.mcw.edu/~bacon/FreeBSD_MRI/	16	http://www.neuro.mcw.edu/~bacon/Ports/FreeBSD/shared_mem.html
		17
		18	The program "abut" has been renamed "afni_abut" to resolve a collision
		19	with the unixstat port.
17	=============================================================================	20	=============================================================================




bin/3dNLfim
bin/3dNotes
bin/3dOverlap
bin/3dPAR2AFNI.pl
bin/3dROIstats
bin/3dRegAna
bin/3dRowFillin

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

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

%%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

%%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

%%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

Return to bug 113887

Lines 1-9 Link Here

(-)afni/Makefile (-12 / +8 lines)
1	############################################################################	1	############################################################################
2	# Ports collection Makefile for: afni	2	# Ports collection Makefile for: afni
3	# Date created: 11 Jan 2005	3	# Date created: 11 Jan 2005
4	# Whom: bacon@smithers.neuro.mcw.edu	4	# Whom: Jason W. Bacon <bacon@smithers.neuro.mcw.edu>
5	#	5	#
6	# $FreeBSD: ports/science/afni/Makefile,v 1.12 2007/06/10 04:04:38 kris Exp $	6	# $FreeBSD$
7	#	7	#
8		8
9	############################################################################	9	############################################################################
Lines 16-23 Link Here
16	# Makefile.BSD, which is included in the source distribution.	16	# Makefile.BSD, which is included in the source distribution.
17		17
18	PORTNAME= afni	18	PORTNAME= afni
19	PORTVERSION= 2007.04.18.1830	19	PORTVERSION= 2007.06.15.1339
20	PORTREVISION= 1
21	CATEGORIES= science biology graphics	20	CATEGORIES= science biology graphics
22	MASTER_SITES= http://www.neuro.mcw.edu/~bacon/Ports/distfiles/AFNI/${PORTVERSION}/ \	21	MASTER_SITES= http://www.neuro.mcw.edu/~bacon/Ports/distfiles/AFNI/${PORTVERSION}/ \
23	http://afni.nimh.nih.gov/pub/dist/tgz/	22	http://afni.nimh.nih.gov/pub/dist/tgz/
Lines 35-49 Link Here
35	ppmtogif:${PORTSDIR}/graphics/netpbm \	34	ppmtogif:${PORTSDIR}/graphics/netpbm \
36	endian:${PORTSDIR}/sysutils/endian	35	endian:${PORTSDIR}/sysutils/endian
37		36
38	BROKEN= Does not compile
39
40	.include <bsd.port.pre.mk>	37	.include <bsd.port.pre.mk>
41		38
42	.if ${ARCH} == "sparc64"	39	.if ${ARCH} == "sparc64"
43	BROKEN= Does not compile on sparc64: "undefined reference to '_mcount'"	40	BROKEN= Does not compile on sparc64: "undefined reference to '_mcount'"
44	.endif	41	.endif
45		42
46	USE_GL= glw	43	USE_GL= glw glu
47	USE_GETTEXT= yes	44	USE_GETTEXT= yes
48	USE_GMAKE= yes	45	USE_GMAKE= yes
49	USE_ICONV= yes	46	USE_ICONV= yes
Lines 80-85 Link Here
80	.for f in ${X11R6_FILES}	77	.for f in ${X11R6_FILES}
81	@${REINPLACE_CMD} -e 's\|/usr/X11R6\|$${X11BASE}\|g' ${WRKSRC}/${f}	78	@${REINPLACE_CMD} -e 's\|/usr/X11R6\|$${X11BASE}\|g' ${WRKSRC}/${f}
82	.endfor	79	.endfor
		80	@${CP} ${DISTDIR}/${DIST_SUBDIR}/afni.1 ${WRKDIR}
		81	@${REINPLACE_CMD} "s\|%%PREFIX%%\|${PREFIX}\|g" ${WRKDIR}/afni.1
83		82
84	post-build:	83	post-build:
85	${MKDIR} ${STAGE}/bin \	84	${MKDIR} ${STAGE}/bin \
Lines 90-99 Link Here
90	${STAGE}/doc \	89	${STAGE}/doc \
91	${STAGE}/share	90	${STAGE}/share
92	${MV} ${INSTALL_WRKSRC}/libf2c.a \	91	${MV} ${INSTALL_WRKSRC}/libf2c.a \
93	${INSTALL_WRKSRC}/cjpeg \
94	${INSTALL_WRKSRC}/djpeg \
95	${INSTALL_WRKSRC}/mpeg_encode \
96	${INSTALL_WRKSRC}/whirlgif \
97	${STAGE}/trash	92	${STAGE}/trash
98	${MV} ${INSTALL_WRKSRC}/*.a \	93	${MV} ${INSTALL_WRKSRC}/*.a \
99	${INSTALL_WRKSRC}/*.so \	94	${INSTALL_WRKSRC}/*.so \
Lines 106-111 Link Here
106	${STAGE}/include	101	${STAGE}/include
107	${MV} ${INSTALL_WRKSRC}/README* \	102	${MV} ${INSTALL_WRKSRC}/README* \
108	${STAGE}/doc	103	${STAGE}/doc
		104	${MV} ${INSTALL_WRKSRC}/abut ${INSTALL_WRKSRC}/afni_abut
109	for binary in `${FILE} ${INSTALL_WRKSRC}/* \| fgrep 'ELF' \| ${AWK} -F ':' ' { print $$1 }'` ; do \	105	for binary in `${FILE} ${INSTALL_WRKSRC}/* \| fgrep 'ELF' \| ${AWK} -F ':' ' { print $$1 }'` ; do \
110	${MV} $${binary} ${STAGE}/bin ; \	106	${MV} $${binary} ${STAGE}/bin ; \
111	done	107	done
Lines 121-127 Link Here
121	${INSTALL_SCRIPT} ${STAGE}/scripts/* ${PREFIX}/bin	117	${INSTALL_SCRIPT} ${STAGE}/scripts/* ${PREFIX}/bin
122	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/TTatlas* ${DATADIR}	118	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/TTatlas* ${DATADIR}
123	${INSTALL_DATA} ${WRKDIR}/CA_EZ_v1.3c-May0806/* ${DATADIR}	119	${INSTALL_DATA} ${WRKDIR}/CA_EZ_v1.3c-May0806/* ${DATADIR}
124	${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/afni.1 ${PREFIX}/man/man1	120	${INSTALL_MAN} ${WRKDIR}/afni.1 ${PREFIX}/man/man1
125	.if !defined(NOPORTDOCS)	121	.if !defined(NOPORTDOCS)
126	${MKDIR} ${DOCSDIR}	122	${MKDIR} ${DOCSDIR}
127	${INSTALL_DATA} ${STAGE}/doc/* ${DOCSDIR}	123	${INSTALL_DATA} ${STAGE}/doc/* ${DOCSDIR}

Lines 1-15 Link Here

(-)afni/distinfo (-15 / +15 lines)
1	MD5 (AFNI-2007.04.18.1830/afni_src.tgz) = 90ecae8727cadc6172517bc7149be67e	1	MD5 (AFNI-2007.06.15.1339/afni_src.tgz) = 19f4c9e5dac9459b14c40475879f1dda
2	SHA256 (AFNI-2007.04.18.1830/afni_src.tgz) = 53796de972179f122ab7c557bf29d3511ed113119d04707e16b0766763f49c21	2	SHA256 (AFNI-2007.06.15.1339/afni_src.tgz) = b4778ada0afb603f4a104ee2448792d5f3b0eea844defda8dd9141002c98a433
3	SIZE (AFNI-2007.04.18.1830/afni_src.tgz) = 11283995	3	SIZE (AFNI-2007.06.15.1339/afni_src.tgz) = 11331933
4	MD5 (AFNI-2007.04.18.1830/afni.1) = 80cc1f1c6ca0ef59a3032ad63abfbdd5	4	MD5 (AFNI-2007.06.15.1339/afni.1) = 02708ca46c60d6774af4796535e263ed
5	SHA256 (AFNI-2007.04.18.1830/afni.1) = 647815326aa676d005fa15de116a6f046b486530aa50a3100d8b29c11da8aaf7	5	SHA256 (AFNI-2007.06.15.1339/afni.1) = f134d1f869b1dfd618c61e58fd24b9c4dcfea9c25bc5b1c26dbbb141719cd6f8
6	SIZE (AFNI-2007.04.18.1830/afni.1) = 1702	6	SIZE (AFNI-2007.06.15.1339/afni.1) = 1667
7	MD5 (AFNI-2007.04.18.1830/TTatlas+tlrc.BRIK.gz) = f5a107b049bc426af5342565f4e5beee	7	MD5 (AFNI-2007.06.15.1339/TTatlas+tlrc.BRIK.gz) = f5a107b049bc426af5342565f4e5beee
8	SHA256 (AFNI-2007.04.18.1830/TTatlas+tlrc.BRIK.gz) = 0b5b087006e07e05c5f0c8306acaade955924f744457cec0c00844cc2e9e67cd	8	SHA256 (AFNI-2007.06.15.1339/TTatlas+tlrc.BRIK.gz) = 0b5b087006e07e05c5f0c8306acaade955924f744457cec0c00844cc2e9e67cd
9	SIZE (AFNI-2007.04.18.1830/TTatlas+tlrc.BRIK.gz) = 159912	9	SIZE (AFNI-2007.06.15.1339/TTatlas+tlrc.BRIK.gz) = 159912
10	MD5 (AFNI-2007.04.18.1830/TTatlas+tlrc.HEAD) = a0ca787a2996d7e66548176808503ac5	10	MD5 (AFNI-2007.06.15.1339/TTatlas+tlrc.HEAD) = a0ca787a2996d7e66548176808503ac5
11	SHA256 (AFNI-2007.04.18.1830/TTatlas+tlrc.HEAD) = 51c3fb158990616f355fea56886fc7c85d80ac96779f5a65a8f69207c2a85919	11	SHA256 (AFNI-2007.06.15.1339/TTatlas+tlrc.HEAD) = 51c3fb158990616f355fea56886fc7c85d80ac96779f5a65a8f69207c2a85919
12	SIZE (AFNI-2007.04.18.1830/TTatlas+tlrc.HEAD) = 1750	12	SIZE (AFNI-2007.06.15.1339/TTatlas+tlrc.HEAD) = 1750
13	MD5 (AFNI-2007.04.18.1830/CA_EZ_v1.3c-May0806.tgz) = dbb2caab5c030c505b306e1526d19150	13	MD5 (AFNI-2007.06.15.1339/CA_EZ_v1.3c-May0806.tgz) = dbb2caab5c030c505b306e1526d19150
14	SHA256 (AFNI-2007.04.18.1830/CA_EZ_v1.3c-May0806.tgz) = b4e9a6bbb2324c01f70d50e911793e637373040c8cca8e5f17882a146396bc31	14	SHA256 (AFNI-2007.06.15.1339/CA_EZ_v1.3c-May0806.tgz) = b4e9a6bbb2324c01f70d50e911793e637373040c8cca8e5f17882a146396bc31
15	SIZE (AFNI-2007.04.18.1830/CA_EZ_v1.3c-May0806.tgz) = 2652278	15	SIZE (AFNI-2007.06.15.1339/CA_EZ_v1.3c-May0806.tgz) = 2652278

Line 0 Link Here

(-)afni/files/patch-SUMA-SUMA_display.c (+53 lines)
	1	--- SUMA/SUMA_display.c.orig Wed Jun 6 12:42:06 2007
	2	+++ SUMA/SUMA_display.c Wed Jun 6 12:45:54 2007
	3	@@ -1854,22 +1854,14 @@
	4
	5
	6
	7	- #ifdef SUMA_MOTIF_GLXAREA
	8	- /* Step 4. */
	9	- SUMAg_SVv[ic].X->FORM = XmCreateForm(SUMAg_SVv[ic].X->TOPLEVEL, "form", NULL, 0);
	10	- XtManageChild(SUMAg_SVv[ic].X->FORM);
	11	- SUMAg_SVv[ic].X->FRAME = XmCreateFrame(SUMAg_SVv[ic].X->FORM, "frame", NULL, 0);
	12	- XtVaSetValues(SUMAg_SVv[ic].X->FRAME,
	13	- XmNbottomAttachment, XmATTACH_FORM,
	14	- XmNtopAttachment, XmATTACH_FORM,
	15	- XmNleftAttachment, XmATTACH_FORM,
	16	- XmNrightAttachment, XmATTACH_FORM,
	17	- NULL);
	18	- XtManageChild(SUMAg_SVv[ic].X->FRAME);
	19	-
	20	- /* Step 5. */
	21	SUMAg_SVv[ic].X->CMAP = SUMA_getShareableColormap(&(SUMAg_SVv[ic]));
	22
	23	+ /* create a frame to put glxarea in */
	24	+ SUMAg_SVv[ic].X->FRAME = XmCreateFrame (mainw, "frame", NULL, 0);
	25	+ XtManageChild(SUMAg_SVv[ic].X->FRAME);
	26	+
	27	+ #ifdef SUMA_MOTIF_GLXAREA
	28	+ SUMA_LH("MOTIF Drawing Area");
	29	/* Step 6. */
	30	/* glwMDrawingAreaWidgetClass requires libMesaGLwM.a */
	31	SUMAg_SVv[ic].X->GLXAREA = XtVaCreateManagedWidget("glxarea",
	32	@@ -1878,20 +1870,13 @@
	33	XtNcolormap, SUMAg_SVv[ic].X->CMAP,
	34	NULL);
	35	#else
	36	- /* Step 4-6. */
	37	- SUMAg_SVv[ic].X->CMAP = SUMA_getShareableColormap(&(SUMAg_SVv[ic]));
	38	-
	39	- /* create a frame to put glxarea in */
	40	- SUMAg_SVv[ic].X->FRAME = XmCreateFrame (mainw, "frame", NULL, 0);
	41	- XtManageChild(SUMAg_SVv[ic].X->FRAME);
	42	-
	43	+ SUMA_LH("GL Drawing Area");
	44	/* glwDrawingAreaWidgetClass requires libMesaGLw.a */
	45	SUMAg_SVv[ic].X->GLXAREA = XtVaCreateManagedWidget("glxarea",
	46	glwDrawingAreaWidgetClass, SUMAg_SVv[ic].X->FRAME,
	47	GLwNvisualInfo, SUMAg_SVv[ic].X->VISINFO,
	48	XtNcolormap, SUMAg_SVv[ic].X->CMAP,
	49	NULL);
	50	-
	51	#endif
	52
	53

Line 0 Link Here

(-)afni/files/patch-SUMA-SUMA_xColBar.c (+26 lines)
	1	--- SUMA/SUMA_xColBar.c.orig Wed Jun 6 12:42:16 2007
	2	+++ SUMA/SUMA_xColBar.c Wed Jun 6 12:43:42 2007
	3	@@ -4087,6 +4087,15 @@
	4	NULL);
	5
	6	/* open me a glxarea */
	7	+ #ifdef SUMA_MOTIF_GLXAREA
	8	+ SO->SurfCont->cmp_ren->cmap_wid = XtVaCreateManagedWidget("glxarea",
	9	+ glwMDrawingAreaWidgetClass, rcc2,
	10	+ GLwNvisualInfo, SUMAg_SVv[0].X->VISINFO,
	11	+ XtNcolormap, SUMAg_SVv[0].X->CMAP,
	12	+ XmNwidth, SUMA_CMAP_WIDTH,
	13	+ XmNheight, SUMA_CMAP_HEIGHT,
	14	+ NULL);
	15	+ #else
	16	SO->SurfCont->cmp_ren->cmap_wid = XtVaCreateManagedWidget("glxarea",
	17	glwDrawingAreaWidgetClass, rcc2,
	18	GLwNvisualInfo, SUMAg_SVv[0].X->VISINFO,
	19	@@ -4094,6 +4103,7 @@
	20	XmNwidth, SUMA_CMAP_WIDTH,
	21	XmNheight, SUMA_CMAP_HEIGHT,
	22	NULL);
	23	+ #endif
	24
	25	XtManageChild (rcc2);
	26

Lines 69-74 Link Here

(-)afni/pkg-plist (-2 / +5 lines)
69	bin/3dNLfim	69	bin/3dNLfim
70	bin/3dNotes	70	bin/3dNotes
71	bin/3dOverlap	71	bin/3dOverlap
		72	bin/3dPAR2AFNI.pl
72	bin/3dROIstats	73	bin/3dROIstats
73	bin/3dRegAna	74	bin/3dRegAna
74	bin/3dRowFillin	75	bin/3dRowFillin
Lines 209-217 Link Here
209	bin/SurfaceMetrics	210	bin/SurfaceMetrics
210	bin/Vecwarp	211	bin/Vecwarp
211	bin/Xphace	212	bin/Xphace
212	bin/abut
213	bin/adwarp	213	bin/adwarp
214	bin/afni	214	bin/afni
		215	bin/afni_abut
215	bin/afni_base.py	216	bin/afni_base.py
216	bin/afni_proc.py	217	bin/afni_proc.py
217	bin/afni_util.py	218	bin/afni_util.py
Lines 281-287 Link Here
281	include/afni/3ddata.h	282	include/afni/3ddata.h
282	include/afni/afni_environ.h	283	include/afni/afni_environ.h
283	include/afni/afni_warp.h	284	include/afni/afni_warp.h
284	include/afni/cdflib.h
285	include/afni/coxplot.h	285	include/afni/coxplot.h
286	include/afni/cs.h	286	include/afni/cs.h
287	include/afni/cs_sort_template.h	287	include/afni/cs_sort_template.h
Lines 406-411 Link Here
406	%%DATADIR%%/face_asanders.jpg	406	%%DATADIR%%/face_asanders.jpg
407	%%DATADIR%%/face_ashackman.jpg	407	%%DATADIR%%/face_ashackman.jpg
408	%%DATADIR%%/face_athomas.jpg	408	%%DATADIR%%/face_athomas.jpg
		409	%%DATADIR%%/face_aysesaygin.jpg
409	%%DATADIR%%/face_bandettini.jpg	410	%%DATADIR%%/face_bandettini.jpg
410	%%DATADIR%%/face_barbaracd.jpg	411	%%DATADIR%%/face_barbaracd.jpg
411	%%DATADIR%%/face_bargall.jpg	412	%%DATADIR%%/face_bargall.jpg
Lines 422-427 Link Here
422	%%DATADIR%%/face_claudio.jpg	423	%%DATADIR%%/face_claudio.jpg
423	%%DATADIR%%/face_cmoritz.jpg	424	%%DATADIR%%/face_cmoritz.jpg
424	%%DATADIR%%/face_cmyers.jpg	425	%%DATADIR%%/face_cmyers.jpg
		426	%%DATADIR%%/face_craigstark.jpg
425	%%DATADIR%%/face_cscholl.jpg	427	%%DATADIR%%/face_cscholl.jpg
426	%%DATADIR%%/face_csenior.jpg	428	%%DATADIR%%/face_csenior.jpg
427	%%DATADIR%%/face_cwettig.jpg	429	%%DATADIR%%/face_cwettig.jpg
Lines 469-474 Link Here
469	%%DATADIR%%/face_lincoln1.jpg	471	%%DATADIR%%/face_lincoln1.jpg
470	%%DATADIR%%/face_lincoln2.jpg	472	%%DATADIR%%/face_lincoln2.jpg
471	%%DATADIR%%/face_lindachao.jpg	473	%%DATADIR%%/face_lindachao.jpg
		474	%%DATADIR%%/face_lindathede.jpg
472	%%DATADIR%%/face_lisaeyler.jpg	475	%%DATADIR%%/face_lisaeyler.jpg
473	%%DATADIR%%/face_lizyoder.jpg	476	%%DATADIR%%/face_lizyoder.jpg
474	%%DATADIR%%/face_ljcox.jpg	477	%%DATADIR%%/face_ljcox.jpg