<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1cc04b295981e57b9c0cd7a4d87e446e6dcd994d">https://github.com/macports/macports-ports/commit/1cc04b295981e57b9c0cd7a4d87e446e6dcd994d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1cc04b295981e57b9c0cd7a4d87e446e6dcd994d
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Wed Nov 9 00:17:45 2016 -0800
<span style='display:block; white-space:pre;color:#404040;'> afni: remove severely broken and outdated port with glib1 dependency.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://trac.macports.org/ticket/52762
</span>---
science/afni/Portfile | 127 -------------------------
science/afni/files/Makefile.i386 | 77 ---------------
science/afni/files/Makefile.ppc | 75 ---------------
science/afni/files/patch-Makefile.INCLUDE.diff | 58 -----------
4 files changed, 337 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/afni/Portfile b/science/afni/Portfile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3ef7b94..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/afni/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,127 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# $Id$
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name afni
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2010_10_19_1028
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname AFNI_${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories science
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Analysis of Functional Neuro Images
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description This is a port of AFNI, Advanced Functional Neuro \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Imaging. AFNI is a tool for analyzing 3 dimensional \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- images, especially functional MRI images used in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- brain mapping research.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://afni.nimh.nih.gov/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:glib1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:openmotif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run port:netpbm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:jpeg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:whirlgif \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:endian
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://afni.nimh.nih.gov/pub/dist/tgz/AFNI_ARCHIVE/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir ${name}/${version}_${revision}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.suffix .tgz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 5909dd8f8decbe81069756d60a89cacd8219a760 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5ba89007c19cca665aab4fa0186c4f971f9e1d5adbb21e6b5d12ee08f64f2202
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # use the right makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/Makefile.${combination} ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # replace Fink path with ours
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|\/sw|${prefix}|g ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # use the right compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|cc|${configure.cc}|g ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # add -ljpeg to llibs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|LLIBS = |LLIBS = -ljpeg |} ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # separate bin/lib/share for manual destroot
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|INSTALLDIR = ${combination}|INSTALLDIR = ${destroot}${prefix}/bin|" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|LIBDIR = \$(INSTALLDIR)|LIBDIR = ${destroot}${prefix}/lib|" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|shared_objs: \$(INSTALLDIR) libmri.so libmrix.so|shared_objs: \$(LIBDIR) libmri.so libmrix.so|" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|MAKE = make|MAKE = make\\\nSHAREDIR = ${destroot}${prefix}/share/${name}|" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile.INCLUDE.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} == 10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set combination macosx_10.6_Intel_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} == 9} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set combination macosx_10.5_Intel_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.build_arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set combination macosx_10.5_Intel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set combination macosx_10.5_G5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.build_arch} eq "ppc"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set combination macosx_10.5_G4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} == 8} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.build_arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set combination macosx_10.4_Intel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set combination macosx_10.4_G5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.build_arch} eq "ppc"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set combination macosx_10.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this appears to be Tiger-only, but i'm uncertain (predates me)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ! [file exists "/usr/X11R6/lib/libGLw.a"] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${distpath}/libGLw.a.tiger /usr/X11R6/lib/libGLw.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #file copy -force ${distpath}/afni.1 ${workpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #reinplace "s|%%PREFIX%%|${prefix}|g" ${workpath}/afni.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target all plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.target vastness
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Deal with files that conflict with other ports
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eval file delete ${destroot}${prefix}/bin/cjpeg ${destroot}${prefix}/bin/djpeg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/bin/whirlgif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${destroot}${prefix}/bin/abut ${destroot}${prefix}/bin/afni_abut
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# xinstall -d -m 755 ${destroot}${prefix}/lib/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# xinstall -d -m 755 ${destroot}${prefix}/include/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# xinstall -d -m 755 ${destroot}${prefix}/share/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# xinstall -d -m 755 ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# eval file rename [glob ${destroot}${prefix}/bin/*.a] ${destroot}${prefix}/lib/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# eval file rename [glob ${destroot}${prefix}/bin/*.so] ${destroot}${prefix}/lib/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# eval file rename [glob ${destroot}${prefix}/bin/*.h] ${destroot}${prefix}/include/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# eval file rename [glob ${destroot}${prefix}/bin/*.jpg] ${destroot}${prefix}/share/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# eval file rename [glob ${destroot}${prefix}/bin/README.*] ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# eval file rename [glob ${destroot}${prefix}/bin/*.txt] ${destroot}${prefix}/share/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Install binaries and scripts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# xinstall -d -m 755 ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# eval xinstall -m 755 [glob ${worksrcpath}/macosx_bin/*] ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-notes "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-abut has been renamed to afni_abut to resolve a collision with the unixstat port.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-AFNI_PLUGIN_PATH should be set to ${prefix}/lib/afni:${prefix}/share/afni.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-AFNI_GLOBAL_SESSION should be set to ${prefix}/share/afni.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url http://afni.nimh.nih.gov/pub/dist/tgz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.version [string map {_ .} ${version}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex (\\d+(\\.\\d+)+)\.*afni_src${extract.suffix}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/afni/files/Makefile.i386 b/science/afni/files/Makefile.i386
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 21a6e5d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/afni/files/Makefile.i386
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,77 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This Makefile is for Mac OSX 10.3, Intel CPU with darwinports glib.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Contributed by Jason W. Bacon, Medical College of Wisconsin.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Do NOT use "cc -fast", since that produces incorrect code for 3dDeconvolve!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# The options below are supposed to be equivalent to "-fast".
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-USE_ZLIB = -DHAVE_ZLIB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LZLIB = -lz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CC_Intel = -march=pentium-m -mtune=prescott
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CCDEBS = -DAFNI_DEBUG -DIMSEQ_DEBUG -DDISPLAY_DEBUG -DTHD_DEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CEXTRA = -Wcomment -Wformat -DUSE_TRACING -DHAVE_XDBE -no-cpp-precomp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DDONT_USE_MCW_MALLOC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CCFAST = cc $(CC_Intel) -DDARWIN $(CEXTRA) -O3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CCVOL = cc $(CC_Intel) -DDARWIN $(CEXTRA) -O2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CC = cc $(CC_Intel) -DDARWIN $(CEXTRA) -O
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CCMIN = cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CCD = $(CC) $(CCDEBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-IFLAGS = -I. -I/usr/X11R6/include -IopenMotif-2.2.3/lib -I/opt/local/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LFLAGS = -L. -L/usr/X11R6/lib -Wl,-force_flat_namespace -L/opt/local/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CCSVD = $(CCFAST)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PLUGIN_SUFFIX = so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PLUGIN_LFLAGS = -flat_namespace -bundle -undefined suppress
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PLUGIN_CC = $(CC) -dynamic -fno-common
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PLFLAGS = -dynamic -L. -L/usr/X11R6/lib -Wl,-force_flat_namespace -L/opt/local/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-SPECIAL = -faltivec -framework Accelerate -DUSE_ALTIVEC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-AR = /usr/bin/ar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-RANLIB = /usr/bin/ranlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-TAR = /usr/bin/tar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MKDIR = /bin/mkdir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-GZIP = /usr/bin/gzip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LD = cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-RM = /bin/rm -f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MV = /bin/mv -f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CP = /bin/cp -f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LINT = /usr/bin/lint -a -b -u -v -x $(IFLAGS) $(CCDEFS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-INSTALLDIR = ./macosx_bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LIBDIR = $(INSTALLDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-INSTALL_PREREQ = suma
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LIBDL = libdl.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Hack for static openMotif to get around MacPorts openMotif-2.3, which
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# breaks the plugins menu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LIBXM = openMotif-2.2.3/lib/Xm/.libs/libXm.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Return to this when MacPorts openMotif works with afni again
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#LIBXM = -lXm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# for dynamic linking
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LLIBS = -lmri -lXp -lXpm -lXext -lXmu ${LIBXM} -lXt -lX11 -lm -lmri -ldl -lc $(LZLIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# For suma
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-SUMA_INCLUDE_PATH = -I/usr/X11R6/include -I./ -I../ -Igts/src -IopenMotif-2.2.3/lib -I/opt/local/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-SUMA_LINK_PATH = -L/usr/lib -L/usr/X11R6/lib -L../ -L/opt/local/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-SUMA_LINK_LIB = -lGLw -lGLU -lGL -lXmu ${LIBXM} -lXp -lXt -lXext -lX11 -lmri -lm -lmx -lglib -bind_at_load $(LZLIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-SUMA_MAKEFILE_NAME = SUMA_Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-SUMA_BIN_ARCHIVE = SUMA_MacOSX.tar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-###############################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MAKE = make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-include Makefile.INCLUDE
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/afni/files/Makefile.ppc b/science/afni/files/Makefile.ppc
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 62822ba..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/afni/files/Makefile.ppc
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,75 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This Makefile is for Mac OSX 10.3 and 10.4 with darwinports.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Contributed by Jason W. Bacon, Medical College of Wisconsin.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Do NOT use "cc -fast", since that produces incorrect code for 3dDeconvolve!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# The options below are supposed to be equivalent to "-fast".
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-USE_ZLIB = -DHAVE_ZLIB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LZLIB = -lz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CC_PPC = -fPIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CCDEBS = -DAFNI_DEBUG -DIMSEQ_DEBUG -DDISPLAY_DEBUG -DTHD_DEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CEXTRA = -Wcomment -Wformat -DUSE_TRACING -DHAVE_XDBE -no-cpp-precomp -DDONT_USE_MCW_MALLOC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CCFAST = cc ${CC_PPC} -DDARWIN $(CEXTRA) -O3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CCVOL = cc ${CC_PPC} -DDARWIN $(CEXTRA) -O2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CC = cc ${CC_PPC} -DDARWIN $(CEXTRA) -O
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CCMIN = cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CCD = $(CC) $(CCDEBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-IFLAGS = -I. -I/usr/X11R6/include -IopenMotif-2.2.3/lib -I/opt/local/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LFLAGS = -L. -L/usr/X11R6/lib -L/opt/local/lib -Wl,-force_flat_namespace
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CCSVD = cc -O0 ${CC_PPC} -no-cpp-precomp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PLUGIN_SUFFIX = so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PLUGIN_LFLAGS = -flat_namespace -bundle -undefined suppress
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PLUGIN_CC = $(CC) -dynamic -fno-common
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PLFLAGS = -dynamic -L. -L/usr/X11R6/lib -L/opt/local/lib -Wl,-force_flat_namespace
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-SPECIAL = -faltivec -framework Accelerate -DUSE_ACCELERATE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-AR = /usr/bin/ar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-RANLIB = /usr/bin/ranlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-TAR = /usr/bin/tar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MKDIR = /bin/mkdir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-GZIP = /usr/bin/gzip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LD = cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-RM = /bin/rm -f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MV = /bin/mv -f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CP = /bin/cp -f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LINT = /usr/bin/lint -a -b -u -v -x $(IFLAGS) $(CCDEFS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-INSTALLDIR = ./macosx_bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LIBDIR = $(INSTALLDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-INSTALL_PREREQ = suma
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LIBDL = libdl.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Hack for static openMotif to get around MacPorts openMotif-2.3, which
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# breaks the plugins menu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LIBXM = openMotif-2.2.3/lib/Xm/.libs/libXm.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Return to this when MacPorts openMotif works with afni again
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#LIBXM = -lXm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# for dynamic linking
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LLIBS = -lmri -lXp -lXpm -lXext -lXmu ${LIBXM} -lXt -lX11 -lm -lmri -ldl -lc $(LZLIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# For suma
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-SUMA_INCLUDE_PATH = -I/usr/X11R6/include -I./ -I../ -Igts/src -IopenMotif-2.2.3/lib -I/opt/local/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-SUMA_LINK_PATH = -L/usr/lib -L/usr/X11R6/lib -L../ -L/opt/local/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-SUMA_LINK_LIB = -lGLw -lGLU -lGL -lXmu ${LIBXM} -lXp -lXt -lXext -lX11 -lmri -lm -lmx -lglib -bind_at_load $(LZLIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-SUMA_MAKEFILE_NAME = SUMA_Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-SUMA_BIN_ARCHIVE = SUMA_MacOSX.tar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-###############################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MAKE = make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-include Makefile.INCLUDE
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/afni/files/patch-Makefile.INCLUDE.diff b/science/afni/files/patch-Makefile.INCLUDE.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e4d997f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/afni/files/patch-Makefile.INCLUDE.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,58 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.INCLUDE.orig 2010-05-30 09:59:00.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.INCLUDE 2010-05-30 10:00:45.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--##
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## Include for MCW AFNI make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## -- goes at end of each platform specific Makefile.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ##
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1497,13 +1497,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ### Put things in their places
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--install: $(INSTALLDIR) $(INSTALL_PREREQ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+install: $(SHAREDIR) $(INSTALLDIR) $(INSTALL_PREREQ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MV) $(PROGRAMS) $(INSTALLDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CP) $(SCRIPTS) $(INSTALLDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CP) $(PY_DIR)/*.py $(R_DIR)/*.R $(INSTALLDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -f README.environment ]; then $(CP) README.* $(INSTALLDIR); fi;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -f AFNI.afnirc ]; then $(CP) AFNI.afnirc $(INSTALLDIR); fi;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -f AFNI.sumarc ]; then $(CP) AFNI.sumarc $(INSTALLDIR); fi;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if [ -f README.environment ]; then $(CP) README.* $(SHAREDIR); fi;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if [ -f AFNI.afnirc ]; then $(CP) AFNI.afnirc $(SHAREDIR); fi;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if [ -f AFNI.sumarc ]; then $(CP) AFNI.sumarc $(SHAREDIR); fi;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install_noplug: $(INSTALLDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MV) $(PROGRAMS_NOPLUG) $(INSTALLDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1888,8 +1888,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(AR) q libmrix.a $(IMOBJS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(RANLIB) libmrix.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--shared_objs: $(INSTALLDIR) libmri.so libmrix.so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(MV) libmri.so libmrix.so $(INSTALLDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+shared_objs: $(LIBDIR) libmri.so libmrix.so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(MV) libmri.so libmrix.so $(LIBDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ###################################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Plugin stuff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1950,9 +1950,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- laconte_plugins: plug_3dsvm.$(SO)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install_plugins: $(INSTALLDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(MV) *.$(PLUGIN_SUFFIX) $(INSTALLDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(CP) faces/face_*.jpg faces/splash_*.jpg poems/poem_*.txt $(INSTALLDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo Plugins put in directory $(INSTALLDIR):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(MV) *.$(PLUGIN_SUFFIX) $(SHAREDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CP) faces/face_*.jpg faces/splash_*.jpg poems/poem_*.txt $(SHAREDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo Plugins put in directory $(SHAREDIR):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo Do not forget to setenv AFNI_PLUGINPATH appropriately
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .c.$(SO):afni_plugin.h afni.h 3ddata.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2905,3 +2905,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CC) $(RccCOMopt) -c toyR.c $(INFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CC) -o toyR toyR.o $(LFLAGS) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(LLIBS) -lf2c -lmri $(RccCOMlfl) AFNI_embeddedRCall.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$(LIBDIR):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if [ ! -d $(LIBDIR) ]; then $(MKDIR) -p $(LIBDIR); echo Made directory $(LIBDIR); fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$(SHAREDIR):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if [ ! -d $(SHAREDIR) ]; then $(MKDIR) -p $(SHAREDIR); echo Made directory $(SHAREDIR); fi
</span></pre><pre style='margin:0'>
</pre>