Ticket #28276: Portfile.diff

Portfile

@@ -4 +4 @@
 PortSystem              1.0
 
 name                    arb
-version                 5.1
+version                 5.2.1
 epoch                   1
 categories              science
 maintainers             me.com:matt.cottrell 
@@ -41 +41 @@
                         port:mesa \
                         port:glw \
                         port:glew \
-                        port:tiff 
+                        port:tiff \
+                        port:xfig \
+                        port:gv
+                        
 
 patchfiles              patch-ARB-config.makefile.diff \
                         patch-ARB-makefile.diff \
                         patch-ARB-RNA3D_GlobalHeader.hxx.diff \
-                        patch-ARB-DARWIN.pl.diff
+                        patch-ARB-DARWIN.pl.diff\
+                        arb_intro.fig.diff
                        
 worksrcdir              stable_5.0
 
@@ -73 +77 @@
                         file copy ${worksrcpath}/config.makefile.template ${worksrcpath}/config.makefile
                         reinplace "s|@@PREFIX@@|${prefix}|g" ${filespath}/arb_macsetup
                         file copy ${filespath}/arb_macsetup ${worksrcpath}/bin
+
+platform darwin 10     {
+                       reinplace "s|OSX_SDK:=/Developer/SDKs/MacOSX10.5.sdk|OSX_SDK:=/Developer/SDKs/MacOSX10.6.sdk|g" ${worksrcpath}/Makefile
+}
 }
 
-platform darwin 9      {
 post-configure         {
+
+platform darwin 9      {
+                       reinplace "s|ARB_64 := 1# compile 64bit ARB version|ARB_64 := 0# compile 64bit ARB version|g" ${worksrcpath}/config.makefile
+}
+platform darwin 10     {
                        reinplace "s|ARB_64 := 1# compile 64bit ARB version|ARB_64 := 0# compile 64bit ARB version|g" ${worksrcpath}/config.makefile
 }
 }
 
+
 build.env-append        ${configure.env}
 build.env-append        PREFIX=${prefix}
 
@@ -117 +130 @@
 
 You have two options (A is easier, B is more difficult):
 
-A) Open a new terminal window and type arb_macsetup to set up your environment automatically
+A) Easy - open a new terminal window and type arb_macsetup to set the necessary environment variables automatically.  This script also enables keyboard shortcuts used in the sequence editor.
 
 or
         
-B) Follow the steps below:
+B) More difficult - follow the steps below:
 
-1a)
+1)
 bash users add the following lines to your ~/.profile or to your ~/.bashrc
 
       ARBHOME=${prefix}/share/arb;export ARBHOME
@@ -132 +145 @@
 
       enter the following command:
       . ~/.profile
-1b)
+2)
 tcsh users add the following lines to your ~/.cshrc
       setenv ARBHOME ${prefix}/share/arb
       setenv PATH ${prefix}/share/arb\:\$PATH
 
       enter the following command:
       source ~/.cshrc
-2)
+3)
+create a text file in your home folder called .xmodmap that contains the text below:
+
+clear Mod1
+clear Mod2
+keycode 63 = Mode_switch
+keycode 66 = Meta_L
+keycode 69 = Meta_R
+add Mod1 = Meta_L Meta_R
+add Mod2 = Mode_switch
+
+C)
+to set up ARB for another user on this computer log into their account and type /opt/local/bin/arb_macsetup
+
+D)
 type arb to start ARB
 
 A demo data base is located at ${prefix}/share/arb.demo.arb