Ticket #29695: afni.diff

File afni.diff, 3.0 KB (added by nerdling (Jeremy Lavergne), 13 years ago)

update and deal with /usr/local/

  • files/patch-Makefile.INCLUDE.diff

     
    1 --- Makefile.INCLUDE.orig       2010-05-30 09:59:00.000000000 -0400
    2 +++ Makefile.INCLUDE    2010-05-30 10:00:45.000000000 -0400
     1--- Makefile.INCLUDE.orig       2011-05-25 15:15:23.000000000 -0400
     2+++ Makefile.INCLUDE    2011-06-01 22:44:51.000000000 -0400
    33@@ -1,4 +1,4 @@
    44-##
    55+
    66 ## Include for MCW AFNI make
    77 ##   -- goes at end of each platform specific Makefile.
    88 ##
    9 @@ -1497,13 +1497,13 @@
     9@@ -1568,13 +1568,13 @@
    1010 
    1111 ### Put things in their places
    1212 
    … …  
    2424 
    2525 install_noplug: $(INSTALLDIR)
    2626        $(MV) $(PROGRAMS_NOPLUG) $(INSTALLDIR)
    27 @@ -1888,8 +1888,8 @@
     27@@ -1968,8 +1968,8 @@
    2828        $(AR) q libmrix.a $(IMOBJS)
    2929        $(RANLIB) libmrix.a
    3030 
    … …  
    3535 
    3636 ###################################################################
    3737 # Plugin stuff
    38 @@ -1950,9 +1950,9 @@
     38@@ -2033,9 +2033,9 @@
    3939 laconte_plugins: plug_3dsvm.$(SO)
    4040 
    4141 install_plugins: $(INSTALLDIR)
    … …  
    4848        echo Do not forget to setenv AFNI_PLUGINPATH appropriately
    4949 
    5050 .c.$(SO):afni_plugin.h afni.h 3ddata.h
    51 @@ -2905,3 +2905,7 @@
     51@@ -3029,3 +3029,8 @@
    5252        $(CC) $(RccCOMopt) -c toyR.c $(INFLAGS)
    5353        $(CC) -o toyR toyR.o $(LFLAGS) \
    54           $(LLIBS) -lf2c -lmri $(RccCOMlfl) AFNI_embeddedRCall.o
     54          $(LLIBS) $(RccCOMlfl) AFNI_embeddedRCall.o
     55+
    5556+$(LIBDIR):
    5657+       if [ ! -d $(LIBDIR) ]; then $(MKDIR) -p $(LIBDIR); echo Made directory $(LIBDIR); fi
    5758+$(SHAREDIR):

  • Portfile

     
    44PortSystem      1.0
    55
    66name                    afni
    7 version             2010_10_19_1028
    8 revision            1
    9 distname                AFNI_${version}
     7version             2011_05_26_1457
     8distname            AFNI_${version}
    109categories              science
    1110maintainers             snc openmaintainer
    1211description             Analysis of Functional Neuro Images
    … …  
    2928dist_subdir         ${name}/${version}_${revision}
    3029extract.suffix      .tgz
    3130
    32 checksums           sha1    42234a0570d62352c0ddb71b48070e9f10744846 \
    33                     rmd160  b39884591e88ae95d5f985b232c31f323067c8aa
     31checksums           sha1    55d93da558f4ece45bd7c505d0b4dd4c9941efe2 \
     32                    rmd160  04c1c4b5a37103b047bdbe0d1b078f15aca8d1e4
    3433
    3534pre-patch {
    3635    # use the right makefile
    … …  
    4645    reinplace "s|LIBDIR = \$(INSTALLDIR)|LIBDIR = ${destroot}${prefix}/lib|" ${worksrcpath}/Makefile
    4746    reinplace "s|shared_objs: \$(INSTALLDIR) libmri.so libmrix.so|shared_objs: \$(LIBDIR) libmri.so libmrix.so|" ${worksrcpath}/Makefile
    4847    reinplace "s|MAKE = make|MAKE = make\\\nSHAREDIR = ${destroot}${prefix}/share/${name}|" ${worksrcpath}/Makefile
     48    # avoid /usr/local/lib like the plague
     49    reinplace "s|-L/usr/local/lib ||" ${worksrcpath}/Makefile
    4950}
    5051patchfiles          patch-Makefile.INCLUDE.diff
    5152