[68266] trunk/dports/science/afni

[snc at macports.org]

Revision: 68266
          http://trac.macports.org/changeset/68266
Author:   snc at macports.org
Date:     2010-05-30 07:23:15 -0700 (Sun, 30 May 2010)
Log Message:
-----------
fix libSUMA build, move all Makefile.INCLUDE changes to patchfile, bump revision

Modified Paths:
--------------
    trunk/dports/science/afni/Portfile
    trunk/dports/science/afni/files/patch-Makefile.INCLUDE.diff

Modified: trunk/dports/science/afni/Portfile
===================================================================
--- trunk/dports/science/afni/Portfile	2010-05-30 14:03:34 UTC (rev 68265)
+++ trunk/dports/science/afni/Portfile	2010-05-30 14:23:15 UTC (rev 68266)
@@ -5,6 +5,7 @@
 
 name		afni
 version		2009_12_31_1431
+revision    1
 distname	AFNI_${version}
 extract.suffix .tgz
 categories	science
@@ -74,12 +75,6 @@
     reinplace "s|LIBDIR = \$(INSTALLDIR)|LIBDIR = ${destroot}${prefix}/lib|" ${worksrcpath}/Makefile
     reinplace "s|shared_objs: \$(INSTALLDIR) libmri.so libmrix.so|shared_objs: \$(LIBDIR) libmri.so libmrix.so|" ${worksrcpath}/Makefile
     reinplace "s|MAKE = make|MAKE = make\\\nSHAREDIR = ${destroot}${prefix}/share/${name}|" ${worksrcpath}/Makefile
-    set mkinc [open ${worksrcpath}/Makefile.INCLUDE a]
-    puts $mkinc "\$(LIBDIR):"
-    puts $mkinc "	if \[ \! -d \$(LIBDIR) \]; then \$(MKDIR) -p \$(LIBDIR); echo Made directory \$(LIBDIR); fi"
-    puts $mkinc "\$(SHAREDIR):"
-    puts $mkinc "	if \[ \! -d \$(SHAREDIR) \]; then \$(MKDIR) -p \$(SHAREDIR); echo Made directory \$(SHAREDIR); fi"
-    close $mkinc
 }
 patchfiles          patch-Makefile.INCLUDE.diff
 

Modified: trunk/dports/science/afni/files/patch-Makefile.INCLUDE.diff
===================================================================
--- trunk/dports/science/afni/files/patch-Makefile.INCLUDE.diff	2010-05-30 14:03:34 UTC (rev 68265)
+++ trunk/dports/science/afni/files/patch-Makefile.INCLUDE.diff	2010-05-30 14:23:15 UTC (rev 68266)
@@ -1,5 +1,5 @@
---- Makefile.INCLUDE.orig	2010-05-29 16:04:42.000000000 -0400
-+++ Makefile.INCLUDE	2010-05-29 16:12:19.000000000 -0400
+--- Makefile.INCLUDE.orig	2010-05-30 09:59:00.000000000 -0400
++++ Makefile.INCLUDE	2010-05-30 10:00:45.000000000 -0400
 @@ -1,4 +1,4 @@
 -##
 +
@@ -48,12 +48,11 @@
  	echo Do not forget to setenv AFNI_PLUGINPATH appropriately
  
  .c.$(SO):afni_plugin.h afni.h 3ddata.h
-@@ -2623,7 +2623,7 @@
- libSUMA.a: libmri.a libmrix.a libcoxplot.a libf2c.a
- 	( cd SUMA ;	\
- 	rm -f libSUMA.a	;\
--	$(MAKE) -f $(SUMA_MAKEFILE_NAME) clean MarchingCubes.o libSUMA.a 'INSTALLDIR=$(INSTALLDIR)' \
-+	$(MAKE) -f $(SUMA_MAKEFILE_NAME) clean MarchingCubes.o libSUMA.a 'INSTALLDIR=$INSTALLDIR)' \
- 	'SUMA_INCLUDE_PATH=$(SUMA_INCLUDE_PATH)' \
- 	'SUMA_BIN_ARCHIVE=$(SUMA_BIN_ARCHIVE)' \
- 	'RANLIB=$(RANLIB)' \
+@@ -2905,3 +2905,7 @@
+ 	$(CC) $(RccCOMopt) -c toyR.c $(INFLAGS)
+ 	$(CC) -o toyR toyR.o $(LFLAGS) \
+          $(LLIBS) -lf2c -lmri $(RccCOMlfl) AFNI_embeddedRCall.o
++$(LIBDIR):
++	if [ ! -d $(LIBDIR) ]; then $(MKDIR) -p $(LIBDIR); echo Made directory $(LIBDIR); fi
++$(SHAREDIR):
++	if [ ! -d $(SHAREDIR) ]; then $(MKDIR) -p $(SHAREDIR); echo Made directory $(SHAREDIR); fi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100530/50e20f16/attachment.html>