[27682] trunk/dports/science/afni

source_changes at macosforge.org source_changes at macosforge.org
Sat Aug 11 18:48:12 PDT 2007


Revision: 27682
          http://trac.macosforge.org/projects/macports/changeset/27682
Author:   nox at macports.org
Date:     2007-08-11 18:48:12 -0700 (Sat, 11 Aug 2007)

Log Message:
-----------
afni: Changed filenames mentionning DarwinPorts.

Modified Paths:
--------------
    trunk/dports/science/afni/Portfile

Added Paths:
-----------
    trunk/dports/science/afni/files/Makefile.i386
    trunk/dports/science/afni/files/Makefile.ppc

Removed Paths:
-------------
    trunk/dports/science/afni/files/Makefile.macosx_Intel_darwinports
    trunk/dports/science/afni/files/Makefile.macosx_PowerPC_darwinports

Modified: trunk/dports/science/afni/Portfile
===================================================================
--- trunk/dports/science/afni/Portfile	2007-08-12 01:47:53 UTC (rev 27681)
+++ trunk/dports/science/afni/Portfile	2007-08-12 01:48:12 UTC (rev 27682)
@@ -31,7 +31,7 @@
 platform powerpc {
 post-patch      {
 		cd ${workpath}/afni_src
-                file copy ${filespath}/Makefile.macosx_PowerPC_darwinports \
+                file copy ${filespath}/Makefile.ppc \
 			Makefile
 		reinplace "s|openMotif-2.2.3|${workpath}/openMotif-2.2.3|g" ${workpath}/afni_src/Makefile
 }
@@ -40,7 +40,7 @@
 platform i386 {
 post-patch      {
 		cd ${workpath}/afni_src
-                file copy ${filespath}/Makefile.macosx_Intel_darwinports \
+                file copy ${filespath}/Makefile.i386 \
 			Makefile
 		reinplace "s|openMotif-2.2.3|${workpath}/openMotif-2.2.3|g" ${workpath}/afni_src/Makefile
 }

Copied: trunk/dports/science/afni/files/Makefile.i386 (from rev 27670, trunk/dports/science/afni/files/Makefile.macosx_Intel_darwinports)
===================================================================
--- trunk/dports/science/afni/files/Makefile.i386	                        (rev 0)
+++ trunk/dports/science/afni/files/Makefile.i386	2007-08-12 01:48:12 UTC (rev 27682)
@@ -0,0 +1,77 @@
+# This Makefile is for Mac OSX 10.3, Intel CPU with darwinports glib.
+# Contributed by Jason W. Bacon, Medical College of Wisconsin.
+# Do NOT use "cc -fast", since that produces incorrect code for 3dDeconvolve!
+# The options below are supposed to be equivalent to "-fast".
+
+USE_ZLIB = -DHAVE_ZLIB
+LZLIB    = -lz
+
+CC_Intel  = -march=pentium-m -mtune=prescott
+
+CCDEBS = -DAFNI_DEBUG -DIMSEQ_DEBUG -DDISPLAY_DEBUG -DTHD_DEBUG
+CEXTRA = -Wcomment -Wformat -DUSE_TRACING -DHAVE_XDBE -no-cpp-precomp \
+       -DDONT_USE_MCW_MALLOC
+CCFAST = cc $(CC_Intel) -DDARWIN  $(CEXTRA) -O3
+CCVOL  = cc $(CC_Intel) -DDARWIN  $(CEXTRA) -O2
+CC     = cc $(CC_Intel) -DDARWIN  $(CEXTRA) -O
+CCMIN  = cc
+CCD    = $(CC) $(CCDEBS)
+
+IFLAGS = -I. -I/usr/X11R6/include -IopenMotif-2.2.3/lib -I/opt/local/include
+LFLAGS = -L. -L/usr/X11R6/lib -Wl,-force_flat_namespace -L/opt/local/lib
+
+CCSVD  = $(CCFAST)
+
+PLUGIN_SUFFIX = so
+PLUGIN_LFLAGS = -flat_namespace -bundle -undefined suppress
+PLUGIN_CC     = $(CC) -dynamic -fno-common
+PLFLAGS       = -dynamic -L. -L/usr/X11R6/lib -Wl,-force_flat_namespace -L/opt/local/lib
+
+SPECIAL = -faltivec -framework Accelerate -DUSE_ALTIVEC
+
+AR     = /usr/bin/ar
+RANLIB = /usr/bin/ranlib
+TAR    = /usr/bin/tar
+MKDIR  = /bin/mkdir
+GZIP   = /usr/bin/gzip
+LD     = cc
+
+RM = /bin/rm -f
+MV = /bin/mv -f
+CP = /bin/cp -f
+
+LINT = /usr/bin/lint -a -b -u -v -x $(IFLAGS) $(CCDEFS)
+
+INSTALLDIR = ./macosx_bin
+LIBDIR = $(INSTALLDIR)
+
+INSTALL_PREREQ = suma
+
+LIBDL = libdl.a
+
+# Hack for static openMotif to get around MacPorts openMotif-2.3, which
+# breaks the plugins menu
+LIBXM = openMotif-2.2.3/lib/Xm/.libs/libXm.a
+
+# Return to this when MacPorts openMotif works with afni again
+#LIBXM = -lXm
+
+# for dynamic linking
+
+LLIBS  = -lmri -lXp -lXpm -lXext -lXmu ${LIBXM} -lXt -lX11 -lm -lmri -ldl -lc $(LZLIB)
+
+# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+# For suma
+SUMA_INCLUDE_PATH = -I/usr/X11R6/include -I./ -I../ -Igts/src -IopenMotif-2.2.3/lib -I/opt/local/include
+SUMA_LINK_PATH = -L/usr/lib -L/usr/X11R6/lib -L../ -L/opt/local/lib
+SUMA_LINK_LIB = -lGLw -lGLU -lGL -lXmu ${LIBXM} -lXp -lXt -lXext -lX11 -lmri -lm -lmx -lglib -bind_at_load $(LZLIB)
+SUMA_MAKEFILE_NAME = SUMA_Makefile
+SUMA_BIN_ARCHIVE = SUMA_MacOSX.tar
+
+# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+###############################################################
+
+MAKE = make
+include Makefile.INCLUDE

Deleted: trunk/dports/science/afni/files/Makefile.macosx_Intel_darwinports
===================================================================
--- trunk/dports/science/afni/files/Makefile.macosx_Intel_darwinports	2007-08-12 01:47:53 UTC (rev 27681)
+++ trunk/dports/science/afni/files/Makefile.macosx_Intel_darwinports	2007-08-12 01:48:12 UTC (rev 27682)
@@ -1,77 +0,0 @@
-# This Makefile is for Mac OSX 10.3, Intel CPU with darwinports glib.
-# Contributed by Jason W. Bacon, Medical College of Wisconsin.
-# Do NOT use "cc -fast", since that produces incorrect code for 3dDeconvolve!
-# The options below are supposed to be equivalent to "-fast".
-
-USE_ZLIB = -DHAVE_ZLIB
-LZLIB    = -lz
-
-CC_Intel  = -march=pentium-m -mtune=prescott
-
-CCDEBS = -DAFNI_DEBUG -DIMSEQ_DEBUG -DDISPLAY_DEBUG -DTHD_DEBUG
-CEXTRA = -Wcomment -Wformat -DUSE_TRACING -DHAVE_XDBE -no-cpp-precomp \
-       -DDONT_USE_MCW_MALLOC
-CCFAST = cc $(CC_Intel) -DDARWIN  $(CEXTRA) -O3
-CCVOL  = cc $(CC_Intel) -DDARWIN  $(CEXTRA) -O2
-CC     = cc $(CC_Intel) -DDARWIN  $(CEXTRA) -O
-CCMIN  = cc
-CCD    = $(CC) $(CCDEBS)
-
-IFLAGS = -I. -I/usr/X11R6/include -IopenMotif-2.2.3/lib -I/opt/local/include
-LFLAGS = -L. -L/usr/X11R6/lib -Wl,-force_flat_namespace -L/opt/local/lib
-
-CCSVD  = $(CCFAST)
-
-PLUGIN_SUFFIX = so
-PLUGIN_LFLAGS = -flat_namespace -bundle -undefined suppress
-PLUGIN_CC     = $(CC) -dynamic -fno-common
-PLFLAGS       = -dynamic -L. -L/usr/X11R6/lib -Wl,-force_flat_namespace -L/opt/local/lib
-
-SPECIAL = -faltivec -framework Accelerate -DUSE_ALTIVEC
-
-AR     = /usr/bin/ar
-RANLIB = /usr/bin/ranlib
-TAR    = /usr/bin/tar
-MKDIR  = /bin/mkdir
-GZIP   = /usr/bin/gzip
-LD     = cc
-
-RM = /bin/rm -f
-MV = /bin/mv -f
-CP = /bin/cp -f
-
-LINT = /usr/bin/lint -a -b -u -v -x $(IFLAGS) $(CCDEFS)
-
-INSTALLDIR = ./macosx_bin
-LIBDIR = $(INSTALLDIR)
-
-INSTALL_PREREQ = suma
-
-LIBDL = libdl.a
-
-# Hack for static openMotif to get around MacPorts openMotif-2.3, which
-# breaks the plugins menu
-LIBXM = openMotif-2.2.3/lib/Xm/.libs/libXm.a
-
-# Return to this when MacPorts openMotif works with afni again
-#LIBXM = -lXm
-
-# for dynamic linking
-
-LLIBS  = -lmri -lXp -lXpm -lXext -lXmu ${LIBXM} -lXt -lX11 -lm -lmri -ldl -lc $(LZLIB)
-
-# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
-# For suma
-SUMA_INCLUDE_PATH = -I/usr/X11R6/include -I./ -I../ -Igts/src -IopenMotif-2.2.3/lib -I/opt/local/include
-SUMA_LINK_PATH = -L/usr/lib -L/usr/X11R6/lib -L../ -L/opt/local/lib
-SUMA_LINK_LIB = -lGLw -lGLU -lGL -lXmu ${LIBXM} -lXp -lXt -lXext -lX11 -lmri -lm -lmx -lglib -bind_at_load $(LZLIB)
-SUMA_MAKEFILE_NAME = SUMA_Makefile
-SUMA_BIN_ARCHIVE = SUMA_MacOSX.tar
-
-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-
-###############################################################
-
-MAKE = make
-include Makefile.INCLUDE

Deleted: trunk/dports/science/afni/files/Makefile.macosx_PowerPC_darwinports
===================================================================
--- trunk/dports/science/afni/files/Makefile.macosx_PowerPC_darwinports	2007-08-12 01:47:53 UTC (rev 27681)
+++ trunk/dports/science/afni/files/Makefile.macosx_PowerPC_darwinports	2007-08-12 01:48:12 UTC (rev 27682)
@@ -1,75 +0,0 @@
-# This Makefile is for Mac OSX 10.3 and 10.4 with darwinports.
-# Contributed by Jason W. Bacon, Medical College of Wisconsin.
-# Do NOT use "cc -fast", since that produces incorrect code for 3dDeconvolve!
-# The options below are supposed to be equivalent to "-fast".
-
-USE_ZLIB = -DHAVE_ZLIB
-LZLIB    = -lz
-
-CC_PPC = -fPIC
-
-CCDEBS = -DAFNI_DEBUG -DIMSEQ_DEBUG -DDISPLAY_DEBUG -DTHD_DEBUG
-CEXTRA = -Wcomment -Wformat -DUSE_TRACING -DHAVE_XDBE -no-cpp-precomp -DDONT_USE_MCW_MALLOC
-CCFAST = cc ${CC_PPC} -DDARWIN $(CEXTRA) -O3
-CCVOL  = cc ${CC_PPC} -DDARWIN $(CEXTRA) -O2
-CC     = cc ${CC_PPC} -DDARWIN $(CEXTRA) -O
-CCMIN  = cc
-CCD    = $(CC) $(CCDEBS)
-IFLAGS = -I. -I/usr/X11R6/include -IopenMotif-2.2.3/lib -I/opt/local/include
-LFLAGS = -L. -L/usr/X11R6/lib -L/opt/local/lib -Wl,-force_flat_namespace
-
-CCSVD  = cc -O0 ${CC_PPC} -no-cpp-precomp
-
-PLUGIN_SUFFIX = so
-PLUGIN_LFLAGS = -flat_namespace -bundle -undefined suppress
-PLUGIN_CC     = $(CC) -dynamic -fno-common
-PLFLAGS       = -dynamic -L. -L/usr/X11R6/lib -L/opt/local/lib -Wl,-force_flat_namespace
-
-SPECIAL = -faltivec -framework Accelerate -DUSE_ACCELERATE
-
-AR     = /usr/bin/ar
-RANLIB = /usr/bin/ranlib
-TAR    = /usr/bin/tar
-MKDIR  = /bin/mkdir
-GZIP   = /usr/bin/gzip
-LD     = cc
-
-RM = /bin/rm -f
-MV = /bin/mv -f
-CP = /bin/cp -f
-
-LINT = /usr/bin/lint -a -b -u -v -x $(IFLAGS) $(CCDEFS)
-
-INSTALLDIR = ./macosx_bin
-LIBDIR = $(INSTALLDIR)
-
-INSTALL_PREREQ = suma
-
-LIBDL = libdl.a
-
-# Hack for static openMotif to get around MacPorts openMotif-2.3, which
-# breaks the plugins menu
-LIBXM = openMotif-2.2.3/lib/Xm/.libs/libXm.a
-
-# Return to this when MacPorts openMotif works with afni again
-#LIBXM = -lXm
-
-# for dynamic linking
-
-LLIBS  = -lmri -lXp -lXpm -lXext -lXmu ${LIBXM} -lXt -lX11 -lm -lmri -ldl -lc $(LZLIB)
-
-# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
-# For suma
-SUMA_INCLUDE_PATH = -I/usr/X11R6/include -I./ -I../ -Igts/src -IopenMotif-2.2.3/lib -I/opt/local/include
-SUMA_LINK_PATH = -L/usr/lib -L/usr/X11R6/lib -L../ -L/opt/local/lib
-SUMA_LINK_LIB = -lGLw -lGLU -lGL -lXmu ${LIBXM} -lXp -lXt -lXext -lX11 -lmri -lm -lmx -lglib -bind_at_load $(LZLIB)
-SUMA_MAKEFILE_NAME = SUMA_Makefile
-SUMA_BIN_ARCHIVE = SUMA_MacOSX.tar
-
-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-
-###############################################################
-
-MAKE = make
-include Makefile.INCLUDE

Copied: trunk/dports/science/afni/files/Makefile.ppc (from rev 27670, trunk/dports/science/afni/files/Makefile.macosx_PowerPC_darwinports)
===================================================================
--- trunk/dports/science/afni/files/Makefile.ppc	                        (rev 0)
+++ trunk/dports/science/afni/files/Makefile.ppc	2007-08-12 01:48:12 UTC (rev 27682)
@@ -0,0 +1,75 @@
+# This Makefile is for Mac OSX 10.3 and 10.4 with darwinports.
+# Contributed by Jason W. Bacon, Medical College of Wisconsin.
+# Do NOT use "cc -fast", since that produces incorrect code for 3dDeconvolve!
+# The options below are supposed to be equivalent to "-fast".
+
+USE_ZLIB = -DHAVE_ZLIB
+LZLIB    = -lz
+
+CC_PPC = -fPIC
+
+CCDEBS = -DAFNI_DEBUG -DIMSEQ_DEBUG -DDISPLAY_DEBUG -DTHD_DEBUG
+CEXTRA = -Wcomment -Wformat -DUSE_TRACING -DHAVE_XDBE -no-cpp-precomp -DDONT_USE_MCW_MALLOC
+CCFAST = cc ${CC_PPC} -DDARWIN $(CEXTRA) -O3
+CCVOL  = cc ${CC_PPC} -DDARWIN $(CEXTRA) -O2
+CC     = cc ${CC_PPC} -DDARWIN $(CEXTRA) -O
+CCMIN  = cc
+CCD    = $(CC) $(CCDEBS)
+IFLAGS = -I. -I/usr/X11R6/include -IopenMotif-2.2.3/lib -I/opt/local/include
+LFLAGS = -L. -L/usr/X11R6/lib -L/opt/local/lib -Wl,-force_flat_namespace
+
+CCSVD  = cc -O0 ${CC_PPC} -no-cpp-precomp
+
+PLUGIN_SUFFIX = so
+PLUGIN_LFLAGS = -flat_namespace -bundle -undefined suppress
+PLUGIN_CC     = $(CC) -dynamic -fno-common
+PLFLAGS       = -dynamic -L. -L/usr/X11R6/lib -L/opt/local/lib -Wl,-force_flat_namespace
+
+SPECIAL = -faltivec -framework Accelerate -DUSE_ACCELERATE
+
+AR     = /usr/bin/ar
+RANLIB = /usr/bin/ranlib
+TAR    = /usr/bin/tar
+MKDIR  = /bin/mkdir
+GZIP   = /usr/bin/gzip
+LD     = cc
+
+RM = /bin/rm -f
+MV = /bin/mv -f
+CP = /bin/cp -f
+
+LINT = /usr/bin/lint -a -b -u -v -x $(IFLAGS) $(CCDEFS)
+
+INSTALLDIR = ./macosx_bin
+LIBDIR = $(INSTALLDIR)
+
+INSTALL_PREREQ = suma
+
+LIBDL = libdl.a
+
+# Hack for static openMotif to get around MacPorts openMotif-2.3, which
+# breaks the plugins menu
+LIBXM = openMotif-2.2.3/lib/Xm/.libs/libXm.a
+
+# Return to this when MacPorts openMotif works with afni again
+#LIBXM = -lXm
+
+# for dynamic linking
+
+LLIBS  = -lmri -lXp -lXpm -lXext -lXmu ${LIBXM} -lXt -lX11 -lm -lmri -ldl -lc $(LZLIB)
+
+# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+# For suma
+SUMA_INCLUDE_PATH = -I/usr/X11R6/include -I./ -I../ -Igts/src -IopenMotif-2.2.3/lib -I/opt/local/include
+SUMA_LINK_PATH = -L/usr/lib -L/usr/X11R6/lib -L../ -L/opt/local/lib
+SUMA_LINK_LIB = -lGLw -lGLU -lGL -lXmu ${LIBXM} -lXp -lXt -lXext -lX11 -lmri -lm -lmx -lglib -bind_at_load $(LZLIB)
+SUMA_MAKEFILE_NAME = SUMA_Makefile
+SUMA_BIN_ARCHIVE = SUMA_MacOSX.tar
+
+# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+###############################################################
+
+MAKE = make
+include Makefile.INCLUDE

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070811/6baa1dd1/attachment.html


More information about the macports-changes mailing list